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

Fixes a locking issue introduced in original patch for LIBOMV-102

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1894 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
2008-06-05 20:25:59 +00:00
parent 3b0c230018
commit 0f62eae6e9
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libsecondlife/ObjectManager.cs
View File

@@ -2128,10 +2128,9 @@ namespace libsecondlife
if (Client.Settings.OBJECT_TRACKING)
{
uint localID;
lock (simulator.ObjectsPrimitives.Dictionary)
{
uint localID;
for (int i = 0; i < kill.ObjectData.Length; i++)
{
localID = kill.ObjectData[i].ID;
@@ -2142,34 +2141,35 @@ namespace libsecondlife
simulator.ObjectsPrimitives.Dictionary.Remove(localID);
}
foreach (Primitive prim in simulator.ObjectsPrimitives.Dictionary.Values)
simulator.ObjectsPrimitives.ForEach(delegate(Primitive prim)
{
if (prim.ParentID == localID)
{
FireOnObjectKilled(simulator, prim.LocalID);
simulator.ObjectsPrimitives.Dictionary.Remove(prim.LocalID);
}
}
});
}
}
}
if (Client.Settings.AVATAR_TRACKING)
{
uint localID;
lock (simulator.ObjectsAvatars.Dictionary)
lock (simulator.ObjectsPrimitives.Dictionary)
{
for (int i = 0; i < kill.ObjectData.Length; i++)
lock (simulator.ObjectsAvatars.Dictionary)
{
localID = kill.ObjectData[i].ID;
if (simulator.ObjectsAvatars.Dictionary.ContainsKey(localID))
simulator.ObjectsAvatars.Dictionary.Remove(localID);
lock (simulator.ObjectsPrimitives.Dictionary)
uint localID;
for (int i = 0; i < kill.ObjectData.Length; i++)
{
localID = kill.ObjectData[i].ID;
if (simulator.ObjectsAvatars.Dictionary.ContainsKey(localID))
simulator.ObjectsAvatars.Dictionary.Remove(localID);
List<uint> rootPrims = new List<uint>();
foreach (Primitive prim in simulator.ObjectsPrimitives.Dictionary.Values)
simulator.ObjectsPrimitives.ForEach(delegate(Primitive prim)
{
if (prim.ParentID == localID)
{
@@ -2177,15 +2177,16 @@ namespace libsecondlife
simulator.ObjectsPrimitives.Dictionary.Remove(prim.LocalID);
rootPrims.Add(prim.LocalID);
}
}
foreach (Primitive prim in simulator.ObjectsPrimitives.Dictionary.Values)
});
simulator.ObjectsPrimitives.ForEach(delegate(Primitive prim)
{
if (rootPrims.Contains(prim.ParentID))
{
FireOnObjectKilled(simulator, prim.LocalID);
simulator.ObjectsPrimitives.Dictionary.Remove(prim.LocalID);
}
}
});
}
}
}