Cause objects to be removed from the database when they go temp or get
attached. Also make sure that parcel prim counts get updated0.6.0-stable
parent
170cb935cd
commit
1b2380db84
|
@ -4215,5 +4215,10 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void DeleteFromStorage(UUID uuid)
|
||||
{
|
||||
m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -714,8 +714,13 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
if (avatar.IsChildAgent) return;
|
||||
|
||||
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)
|
||||
{
|
||||
|
@ -2082,7 +2087,13 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
SceneObjectPart selectionPart = GetChildPart(localID);
|
||||
|
||||
if (data[47] != 0) // Temporary
|
||||
{
|
||||
DetachFromBackup();
|
||||
// Remove from database and parcel prim count
|
||||
//
|
||||
m_scene.DeleteFromStorage(UUID);
|
||||
m_scene.EventManager.TriggerParcelPrimCountTainted();
|
||||
}
|
||||
|
||||
if (selectionPart != null)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue