Merge branch 'dev' into dsg

dsg
Dan Lake 2011-06-30 14:33:04 -07:00
commit c06d9569d2
1 changed files with 5 additions and 3 deletions

View File

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