OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into dsg

dsg
Dan Lake 2011-06-30 14:33:04 -07:00
parent 60798f77a8 6574690c7b
commit c06d9569d2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -2166,12 +2166,14 @@ namespace OpenSim.Region.Framework.Scenes
if (OnObjectCreateBySync != null) if (OnObjectCreateBySync != null)
OnObjectCreateBySync(sceneObject); OnObjectCreateBySync(sceneObject);
lock (SceneObjectGroupsByFullID) lock (SceneObjectGroupsByFullID)
{
SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject; SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
lock (SceneObjectGroupsByFullPartID)
{
SceneObjectGroupsByFullPartID[sceneObject.UUID] = sceneObject;
foreach (SceneObjectPart part in children) foreach (SceneObjectPart part in children)
SceneObjectGroupsByFullID[part.UUID] = sceneObject; SceneObjectGroupsByFullPartID[part.UUID] = sceneObject;
} }
lock (SceneObjectGroupsByLocalPartID) lock (SceneObjectGroupsByLocalPartID)