aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-12-06 00:50:28 +0000
committerMelanie2009-12-06 02:53:50 +0000
commit5259a32319fd2b27faa3dcd070dece7b428dfd80 (patch)
treef66ceff713b53dd4a318dbbb927fcacd84a084fc
parentLock updates out while linking and unlinking (diff)
downloadopensim-SC_OLD-5259a32319fd2b27faa3dcd070dece7b428dfd80.zip
opensim-SC_OLD-5259a32319fd2b27faa3dcd070dece7b428dfd80.tar.gz
opensim-SC_OLD-5259a32319fd2b27faa3dcd070dece7b428dfd80.tar.bz2
opensim-SC_OLD-5259a32319fd2b27faa3dcd070dece7b428dfd80.tar.xz
Remove extra forced updates. They're not needed for each prim. Really.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6170caa..cb87212 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2114,14 +2114,14 @@ namespace OpenSim.Region.Framework.Scenes
2114 public void LinkToGroup(SceneObjectGroup objectGroup) 2114 public void LinkToGroup(SceneObjectGroup objectGroup)
2115 { 2115 {
2116 // Make sure we have sent any pending unlinks or stuff. 2116 // Make sure we have sent any pending unlinks or stuff.
2117 if (objectGroup.RootPart.UpdateFlag > 0) 2117 //if (objectGroup.RootPart.UpdateFlag > 0)
2118 { 2118 //{
2119 m_log.WarnFormat( 2119 // m_log.WarnFormat(
2120 "[SCENE OBJECT GROUP]: Forcing send of linkset {0}, {1} to {2}, {3} as its still waiting.", 2120 // "[SCENE OBJECT GROUP]: Forcing send of linkset {0}, {1} to {2}, {3} as its still waiting.",
2121 objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); 2121 // objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
2122 2122
2123 objectGroup.RootPart.SendScheduledUpdates(); 2123 // objectGroup.RootPart.SendScheduledUpdates();
2124 } 2124 //}
2125 2125
2126// m_log.DebugFormat( 2126// m_log.DebugFormat(
2127// "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}", 2127// "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}",