aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2010-04-05 18:22:15 +0100
committerMelanie2010-04-05 18:22:15 +0100
commitba31b31ed08427f359f2ec54caf0f4e43f8c9b3d (patch)
treef2aadaca30ea0e286b524dbb2fa6d2a88423d873 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
downloadopensim-SC-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.zip
opensim-SC-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.tar.gz
opensim-SC-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.tar.bz2
opensim-SC-ba31b31ed08427f359f2ec54caf0f4e43f8c9b3d.tar.xz
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7ed29a5..014b007 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2171,7 +2171,6 @@ namespace OpenSim.Region.Framework.Scenes
2171 public void ScheduleGroupForTerseUpdate() 2171 public void ScheduleGroupForTerseUpdate()
2172 { 2172 {
2173 lockPartsForRead(true); 2173 lockPartsForRead(true);
2174
2175 foreach (SceneObjectPart part in m_parts.Values) 2174 foreach (SceneObjectPart part in m_parts.Values)
2176 { 2175 {
2177 part.ScheduleTerseUpdate(); 2176 part.ScheduleTerseUpdate();
@@ -2184,11 +2183,11 @@ namespace OpenSim.Region.Framework.Scenes
2184 /// Immediately send a full update for this scene object. 2183 /// Immediately send a full update for this scene object.
2185 /// </summary> 2184 /// </summary>
2186 public void SendGroupFullUpdate() 2185 public void SendGroupFullUpdate()
2187 { 2186 {
2188 if (IsDeleted) 2187 if (IsDeleted)
2189 return; 2188 return;
2190 2189
2191// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID); 2190// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
2192 2191
2193 RootPart.SendFullUpdateToAllClients(); 2192 RootPart.SendFullUpdateToAllClients();
2194 2193