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

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

afrisby
MW 2007-08-21 17:47:01 +00:00
parent 16f75978ce
commit 249826893d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -877,6 +877,7 @@ namespace OpenSim.Region.Environment.Scenes
if (Entities.ContainsKey(entID)) if (Entities.ContainsKey(entID))
{ {
Entities.Remove(entID); Entities.Remove(entID);
storageManager.DataStore.RemoveObject(entID, this.m_regInfo.SimUUID);
return true; return true;
} }
return false; return false;

4
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -460,6 +460,7 @@ namespace OpenSim.Region.Environment.Scenes
m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup; m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup;
m_scene.DeleteEntity(objectGroup.UUID); m_scene.DeleteEntity(objectGroup.UUID);
objectGroup.DeleteParts(); objectGroup.DeleteParts();
this.ScheduleGroupForFullUpdate(); this.ScheduleGroupForFullUpdate();
} }
@ -741,9 +742,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
this.AbsolutePosition = newPos; this.AbsolutePosition = newPos;
pos.X = newPos.X;
pos.Y = newPos.Y;
pos.Z = newPos.Z;
this.ScheduleGroupForTerseUpdate(); this.ScheduleGroupForTerseUpdate();
} }
#endregion #endregion