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

Cause objects to be removed from the database when they go temp or get 

attached. Also make sure that parcel prim counts get updated
0.6.0-stable
Melanie Thielker 2008-10-03 16:18:38 +00:00
parent 170cb935cd
commit 1b2380db84
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4215,5 +4215,10 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
} }
public void DeleteFromStorage(UUID uuid)
{
m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
}
} }
} }

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

@ -714,8 +714,13 @@ namespace OpenSim.Region.Environment.Scenes
if (avatar.IsChildAgent) return; if (avatar.IsChildAgent) return;
DetachFromBackup(); DetachFromBackup();
m_rootPart.AttachedAvatar = agentID;
// Remove from database and parcel prim count
//
m_scene.DeleteFromStorage(UUID);
m_scene.EventManager.TriggerParcelPrimCountTainted();
m_rootPart.AttachedAvatar = agentID;
if (m_rootPart.PhysActor != null) if (m_rootPart.PhysActor != null)
{ {
@ -2082,7 +2087,13 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectPart selectionPart = GetChildPart(localID); SceneObjectPart selectionPart = GetChildPart(localID);
if (data[47] != 0) // Temporary if (data[47] != 0) // Temporary
{
DetachFromBackup(); DetachFromBackup();
// Remove from database and parcel prim count
//
m_scene.DeleteFromStorage(UUID);
m_scene.EventManager.TriggerParcelPrimCountTainted();
}
if (selectionPart != null) if (selectionPart != null)
{ {