ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Stop nulling SOG.m_rootPart and parts on object deletion

Browse Source 
* This renders RootPart == null checks useless - the replacement is to check SOG.IsDeleted.  However, in many cases this will not be necessary since updates to deleted parts 
will not be sent to the client
* This should remove any remaining race conditions where an object is deleted while another thread is yet to obtain the root part to perform some operation
* Doing this is probably a necessary prerequisite to moving to a model without a separate SOG and SOP
* Unfortunately it's not possible to eliminate all RootPart == null checks since in some contexts it is currently used to check whether an object was created successfully
This commit is contained in:
Justin Clarke Casey
2008-11-17 15:40:27 +00:00
parent dd37fbb137
commit d54b6608a7
7 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1035,9 +1035,6 @@ namespace OpenSim.Region.Environment.Scenes
public void DeleteGroup(bool silent)
{
// We need to keep track of this state in case this group is still queued for backup.
// FIXME: This is a poor temporary solution, since it still leaves plenty of scope for race
// conditions where a user deletes an entity while it is being stored. Really, the update
// code needs a redesign.
m_isDeleted = true;
DetachFromBackup();
@@ -1063,9 +1060,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
m_rootPart = null;
m_parts.Clear();
}
}
@@ -1228,7 +1222,7 @@ namespace OpenSim.Region.Environment.Scenes
// Since this is the top of the section of call stack for backing up a particular scene object, don't let
// any exception propogate upwards.
if (RootPart == null || UUID == UUID.Zero)
if (IsDeleted || UUID == UUID.Zero)
{
// DetachFromBackup();
return;
@@ -1932,8 +1926,8 @@ namespace OpenSim.Region.Environment.Scenes
}
m_scene.UnlinkSceneObject(objectGroup.UUID, true);
objectGroup.Children.Clear();
objectGroup.m_rootPart = null;
// objectGroup.Children.Clear();
// objectGroup.m_rootPart = null;
// TODO Deleting the original group object may cause problems later on if they have already
// made it into the update queue. However, sending out updates for those parts is now
@@ -2803,6 +2797,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
public float GetMass()
{
float retmass = 0f;
@@ -2815,11 +2810,12 @@ namespace OpenSim.Region.Environment.Scenes
}
return retmass;
}
public void CheckSculptAndLoad()
{
lock (m_parts)
{
if (RootPart != null)
if (!IsDeleted)
{
if ((RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) == 0)
{