Old group is now deleted from datastore when you link groups/prims, so that the new group can be stored correctly.

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
             if (Entities.ContainsKey(entID))
             {
                 Entities.Remove(entID);
+                storageManager.DataStore.RemoveObject(entID, this.m_regInfo.SimUUID);
                 return true;
             }
             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
 
             m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup;
             m_scene.DeleteEntity(objectGroup.UUID);
+            
             objectGroup.DeleteParts();
             this.ScheduleGroupForFullUpdate();
         }
@@ -741,9 +742,6 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
             this.AbsolutePosition = newPos;
-            pos.X = newPos.X;
-            pos.Y = newPos.Y;
-            pos.Z = newPos.Z;
             this.ScheduleGroupForTerseUpdate();
         }
         #endregion