aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-12-06 00:50:28 +0000
committerMelanie2009-12-06 00:50:28 +0000
commitf2891e77383f70d807f4ef1ceefbf9a0f2bf6a84 (patch)
tree630a00a47742698b7f02ef613695193d958b497b
parentLock updates out while linking and unlinking (diff)
downloadopensim-SC_OLD-f2891e77383f70d807f4ef1ceefbf9a0f2bf6a84.zip
opensim-SC_OLD-f2891e77383f70d807f4ef1ceefbf9a0f2bf6a84.tar.gz
opensim-SC_OLD-f2891e77383f70d807f4ef1ceefbf9a0f2bf6a84.tar.bz2
opensim-SC_OLD-f2891e77383f70d807f4ef1ceefbf9a0f2bf6a84.tar.xz
Remove extra forced updates. They're not needed for each prim. Really.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index fa2e3ce..93888f1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2292,14 +2292,14 @@ namespace OpenSim.Region.Framework.Scenes
2292 public void LinkToGroup(SceneObjectGroup objectGroup) 2292 public void LinkToGroup(SceneObjectGroup objectGroup)
2293 { 2293 {
2294 // Make sure we have sent any pending unlinks or stuff. 2294 // Make sure we have sent any pending unlinks or stuff.
2295 if (objectGroup.RootPart.UpdateFlag > 0) 2295 //if (objectGroup.RootPart.UpdateFlag > 0)
2296 { 2296 //{
2297 m_log.WarnFormat( 2297 // m_log.WarnFormat(
2298 "[SCENE OBJECT GROUP]: Forcing send of linkset {0}, {1} to {2}, {3} as its still waiting.", 2298 // "[SCENE OBJECT GROUP]: Forcing send of linkset {0}, {1} to {2}, {3} as its still waiting.",
2299 objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); 2299 // objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
2300 2300
2301 objectGroup.RootPart.SendScheduledUpdates(); 2301 // objectGroup.RootPart.SendScheduledUpdates();
2302 } 2302 //}
2303 2303
2304// m_log.DebugFormat( 2304// m_log.DebugFormat(
2305// "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}", 2305// "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}",