Re-organized the access of the mutex in Terrain to avoid deadlocks, and temporarily switched off the update of the neightbouring tile boundaries within the GeometryTechnique::generateGeometry method, again to avoid deadlocks.

src/osgTerrain/GeometryTechnique.cpp

@@ -903,7 +903,7 @@ void GeometryTechnique::generateGeometry(BufferData& buffer, Locator* masterLoca
 
         _neighbours.clear();
 
-        bool updateNeighboursImmediately = true;
+        bool updateNeighboursImmediately = false;
 
         if (left_tile.valid())   addNeighbour(left_tile.get());
         if (right_tile.valid())  addNeighbour(right_tile.get());

src/osgTerrain/Terrain.cpp

@@ -84,15 +84,21 @@ void Terrain::traverse(osg::NodeVisitor& nv)
         osgUtil::UpdateVisitor* uv = dynamic_cast<osgUtil::UpdateVisitor*>(&nv);
         if (uv)
         {
-            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
+            typedef std::list< osg::ref_ptr<TerrainTile> >  TerrainTileList;
-            for(TerrainTileSet::iterator itr = _updateTerrainTileSet.begin();
+            TerrainTileList tiles;
-                itr != _updateTerrainTileSet.end();
+            {
+                OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
+                std::copy(_updateTerrainTileSet.begin(), _updateTerrainTileSet.end(), std::back_inserter(tiles));
+                _updateTerrainTileSet.clear();
+            }
+
+            for(TerrainTileList::iterator itr = tiles.begin();
+                itr != tiles.end();
                 ++itr)
             {
                 TerrainTile* tile = *itr;
                 tile->traverse(nv);
             }
-            _updateTerrainTileSet.clear();
         }
     }