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

* Experimental softening of SOG waiting for update on link - changing from abort to forced update.

GenericGridServerConcept
lbsa71 2009-02-25 12:26:00 +00:00
parent 41c883ea47
commit 8306ec9cae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1991,14 +1991,14 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="objectGroup">The group of prims which should be linked to this group</param> /// <param name="objectGroup">The group of prims which should be linked to this group</param>
public void LinkToGroup(SceneObjectGroup objectGroup) public void LinkToGroup(SceneObjectGroup objectGroup)
{ {
// Make sure we have sent any pending unlinks or stuff.
if (objectGroup.RootPart.UpdateFlag > 0) if (objectGroup.RootPart.UpdateFlag > 0)
{ {
// I've never actually seen this happen, though I think it's theoretically possible
m_log.WarnFormat( m_log.WarnFormat(
"[SCENE OBJECT GROUP]: Aborted linking {0}, {1} to {2}, {3} as it has yet to finish delinking", "[SCENE OBJECT GROUP]: Forcing send of linkset {0}, {1} to {2}, {3} as its still waiting.",
objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
return; objectGroup.RootPart.SendScheduledUpdates();
} }
// m_log.DebugFormat( // m_log.DebugFormat(