aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-08-08 18:24:33 +0100
committerMelanie2010-08-08 18:24:33 +0100
commit321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2 (patch)
treefe6321cf65640d1e6c9fd94b65a3cf5981470204 /OpenSim/Region/Framework/Scenes
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd distance sort for null, too (diff)
downloadopensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.zip
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.gz
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.bz2
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 0d15cb4..3c3f4b7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2317,8 +2317,8 @@ namespace OpenSim.Region.Framework.Scenes
2317 /// </summary> 2317 /// </summary>
2318 public void ScheduleGroupForFullUpdate() 2318 public void ScheduleGroupForFullUpdate()
2319 { 2319 {
2320 //if (IsAttachment) 2320// if (IsAttachment)
2321 // m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, LocalId); 2321// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, LocalId);
2322 2322
2323 checkAtTargets(); 2323 checkAtTargets();
2324 RootPart.ScheduleFullUpdate(); 2324 RootPart.ScheduleFullUpdate();