Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIBOMV-612: TerrainManager (Locking the wrong Dictionary), patch by Douglas R Miles

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2933 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Latif Khalifa
2009-06-29 06:47:29 +00:00
parent 7ec16b5b18
commit 29cb7d1d7c
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
OpenMetaverse/TerrainManager.cs
View File

@@ -73,22 +73,26 @@ namespace OpenMetaverse
{
if (x >= 0 && x < 256 && y >= 0 && y < 256)
{
lock (SimPatches)
TerrainPatch[] found;
lock (SimPatches.Dictionary)
{
if (SimPatches.ContainsKey(regionHandle))
if (!SimPatches.TryGetValue(regionHandle, out found))
{
int patchX = x / 16;
int patchY = y / 16;
x = x % 16;
y = y % 16;
if (SimPatches[regionHandle][patchY * 16 + patchX] != null)
{
height = SimPatches[regionHandle][patchY * 16 + patchX].Data[y * 16 + x];
return true;
}
height = 0.0f;
return false;
}
}
int patchX = x / 16;
int patchY = y / 16;
x = x % 16;
y = y % 16;
TerrainPatch patch = found[patchY * 16 + patchX];
if (patch != null)
{
height = patch.Data[y * 16 + x];
return true;
}
}
height = 0.0f;
@@ -137,18 +141,19 @@ namespace OpenMetaverse
if (Client.Settings.STORE_LAND_PATCHES)
{
lock (SimPatches)
{
if (!SimPatches.ContainsKey(simulator.Handle))
SimPatches.Add(simulator.Handle, new TerrainPatch[16 * 16]);
TerrainPatch[] found;
lock (SimPatches.Dictionary)
if (!SimPatches.TryGetValue(simulator.Handle, out found))
{
found = new TerrainPatch[16 * 16];
SimPatches.Add(simulator.Handle, found);
}
TerrainPatch patch = new TerrainPatch();
patch.Data = heightmap;
patch.X = x;
patch.Y = y;
found[y * 16 + x] = patch;
TerrainPatch patch = new TerrainPatch();
patch.Data = heightmap;
patch.X = x;
patch.Y = y;
SimPatches[simulator.Handle][y * 16 + x] = patch;
}
}
}
}