From fe623f09003d658cdef6620300988afce57539b7 Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Tue, 29 Mar 2011 16:29:00 -0700 Subject: [PATCH] Updated dev code to work with latest changes in opensim master --- .../RegionSync/RegionSyncModule/RegionSyncAvatar.cs | 5 +++++ OpenSim/Region/Framework/Scenes/SceneGraph.cs | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs index b258b80983..4f24ae5d7f 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs @@ -978,6 +978,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) { + } + + public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) + { + } public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 1c8eb541cd..2ba40dc688 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -2192,11 +2192,11 @@ namespace OpenSim.Region.Framework.Scenes SceneObjectGroupsByFullID[part.UUID] = sceneObject; } - lock (SceneObjectGroupsByLocalID) + lock (SceneObjectGroupsByLocalPartID) { - SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject; + SceneObjectGroupsByLocalPartID[sceneObject.LocalId] = sceneObject; foreach (SceneObjectPart part in children) - SceneObjectGroupsByLocalID[part.LocalId] = sceneObject; + SceneObjectGroupsByLocalPartID[part.LocalId] = sceneObject; } return updateResult; @@ -2213,11 +2213,11 @@ namespace OpenSim.Region.Framework.Scenes SceneObjectGroupsByFullID[newPart.UUID] = parentGroup; } - lock (SceneObjectGroupsByLocalID) + lock (SceneObjectGroupsByLocalPartID) { - SceneObjectGroupsByLocalID[parentGroup.LocalId] = parentGroup; + SceneObjectGroupsByLocalPartID[parentGroup.LocalId] = parentGroup; foreach (SceneObjectPart part in children) - SceneObjectGroupsByLocalID[newPart.LocalId] = parentGroup; + SceneObjectGroupsByLocalPartID[newPart.LocalId] = parentGroup; } }