aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorsacha2010-08-07 13:41:56 +0000
committersacha2010-08-07 13:41:56 +0000
commitb58a47c37372a4b63f5f9033a87b5ab262235849 (patch)
treefb3da5e3711c1dcd97a6e39518a81f51f0504f6d /OpenSim/Region/Framework/Scenes
parentand another endless debug cleaning (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-b58a47c37372a4b63f5f9033a87b5ab262235849.zip
opensim-SC_OLD-b58a47c37372a4b63f5f9033a87b5ab262235849.tar.gz
opensim-SC_OLD-b58a47c37372a4b63f5f9033a87b5ab262235849.tar.bz2
opensim-SC_OLD-b58a47c37372a4b63f5f9033a87b5ab262235849.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 0dc63ef..a828127 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -476,6 +476,7 @@ namespace OpenSim.Region.Framework.Scenes
476 part.IgnoreUndoUpdate = false; 476 part.IgnoreUndoUpdate = false;
477 part.StoreUndoState(UndoType.STATE_GROUP_POSITION); 477 part.StoreUndoState(UndoType.STATE_GROUP_POSITION);
478 part.GroupPosition = val; 478 part.GroupPosition = val;
479 part.TriggerScriptChangedEvent(Changed.POSITION);
479 } 480 }
480 481
481 foreach (ScenePresence av in m_linkedAvatars) 482 foreach (ScenePresence av in m_linkedAvatars)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 773b012..b0ce450 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -60,7 +60,8 @@ namespace OpenSim.Region.Framework.Scenes
60 TELEPORT = 512, 60 TELEPORT = 512,
61 REGION_RESTART = 1024, 61 REGION_RESTART = 1024,
62 MEDIA = 2048, 62 MEDIA = 2048,
63 ANIMATION = 16384 63 ANIMATION = 16384,
64 POSITION = 32768
64 } 65 }
65 66
66 // I don't really know where to put this except here. 67 // I don't really know where to put this except here.
@@ -730,6 +731,7 @@ namespace OpenSim.Region.Framework.Scenes
730 } 731 }
731 } 732 }
732 } 733 }
734 TriggerScriptChangedEvent(Changed.POSITION);
733 } 735 }
734 } 736 }
735 737