aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-08-21 17:47:01 +0000
committerMW2007-08-21 17:47:01 +0000
commit249826893db4e5a9fa7f9188fd64798f2a15a80e (patch)
tree3e9fa9e0756e4b9cbb36a7889bc278fc60ee8484 /OpenSim
parentThink linking prims should now work correctly (if its not then please someone... (diff)
downloadopensim-SC_OLD-249826893db4e5a9fa7f9188fd64798f2a15a80e.zip
opensim-SC_OLD-249826893db4e5a9fa7f9188fd64798f2a15a80e.tar.gz
opensim-SC_OLD-249826893db4e5a9fa7f9188fd64798f2a15a80e.tar.bz2
opensim-SC_OLD-249826893db4e5a9fa7f9188fd64798f2a15a80e.tar.xz
Old group is now deleted from datastore when you link groups/prims, so that the new group can be stored correctly.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs4
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 02a035d..f674ce2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -877,6 +877,7 @@ namespace OpenSim.Region.Environment.Scenes
877 if (Entities.ContainsKey(entID)) 877 if (Entities.ContainsKey(entID))
878 { 878 {
879 Entities.Remove(entID); 879 Entities.Remove(entID);
880 storageManager.DataStore.RemoveObject(entID, this.m_regInfo.SimUUID);
880 return true; 881 return true;
881 } 882 }
882 return false; 883 return false;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 03ad8c5..2151ded 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -460,6 +460,7 @@ namespace OpenSim.Region.Environment.Scenes
460 460
461 m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup; 461 m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup;
462 m_scene.DeleteEntity(objectGroup.UUID); 462 m_scene.DeleteEntity(objectGroup.UUID);
463
463 objectGroup.DeleteParts(); 464 objectGroup.DeleteParts();
464 this.ScheduleGroupForFullUpdate(); 465 this.ScheduleGroupForFullUpdate();
465 } 466 }
@@ -741,9 +742,6 @@ namespace OpenSim.Region.Environment.Scenes
741 } 742 }
742 } 743 }
743 this.AbsolutePosition = newPos; 744 this.AbsolutePosition = newPos;
744 pos.X = newPos.X;
745 pos.Y = newPos.Y;
746 pos.Z = newPos.Z;
747 this.ScheduleGroupForTerseUpdate(); 745 this.ScheduleGroupForTerseUpdate();
748 } 746 }
749 #endregion 747 #endregion