From 8306ec9caeaa499e9584b8490d7e83d02c29bbb9 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 25 Feb 2009 12:26:00 +0000 Subject: * Experimental softening of SOG waiting for update on link - changing from abort to forced update. --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 2ca0342..d2d4acd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -1991,14 +1991,14 @@ namespace OpenSim.Region.Framework.Scenes /// The group of prims which should be linked to this group public void LinkToGroup(SceneObjectGroup objectGroup) { + // Make sure we have sent any pending unlinks or stuff. if (objectGroup.RootPart.UpdateFlag > 0) { - // I've never actually seen this happen, though I think it's theoretically possible 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); - return; + objectGroup.RootPart.SendScheduledUpdates(); } // m_log.DebugFormat( -- cgit v1.1