aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2010-03-15 17:23:35 +0000
committerMelanie2010-03-15 17:23:35 +0000
commitd3f33acc1a6a385ee19814286fe27cb5e48c1551 (patch)
tree07795e74a637ca63d96b5ee06950b8c1a7a99489 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentflip UVs for profile faces (diff)
downloadopensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.zip
opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.gz
opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.bz2
opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6c4b39d..d083119 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
645 ApplyPhysics(m_scene.m_physicalPrim); 645 ApplyPhysics(m_scene.m_physicalPrim);
646 646
647 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled 647 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
648 // for the same object with very different properties. The caller must schedule the update. 648 // for the same object with very different properties. The caller must schedule the update.
649 //ScheduleGroupForFullUpdate(); 649 //ScheduleGroupForFullUpdate();
650 } 650 }
651 651
@@ -2185,11 +2185,11 @@ namespace OpenSim.Region.Framework.Scenes
2185 /// Immediately send a full update for this scene object. 2185 /// Immediately send a full update for this scene object.
2186 /// </summary> 2186 /// </summary>
2187 public void SendGroupFullUpdate() 2187 public void SendGroupFullUpdate()
2188 { 2188 {
2189 if (IsDeleted) 2189 if (IsDeleted)
2190 return; 2190 return;
2191 2191
2192// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID); 2192// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
2193 2193
2194 RootPart.SendFullUpdateToAllClients(); 2194 RootPart.SendFullUpdateToAllClients();
2195 2195