diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 1b2ea8e..f52e764 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -180,6 +180,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
183 | /// <summary> | ||
184 | /// The absolute position of this scene object in the scene | ||
185 | /// </summary> | ||
183 | public override Vector3 AbsolutePosition | 186 | public override Vector3 AbsolutePosition |
184 | { | 187 | { |
185 | get | 188 | get |
@@ -195,8 +198,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
195 | set | 198 | set |
196 | { | 199 | { |
197 | Vector3 val = value; | 200 | Vector3 val = value; |
201 | |||
198 | if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !m_rootPart.IsAttachment) | 202 | if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !m_rootPart.IsAttachment) |
199 | { | 203 | { |
200 | m_scene.CrossPrimGroupIntoNewRegion(val, this); | 204 | m_scene.CrossPrimGroupIntoNewRegion(val, this); |
201 | } | 205 | } |
202 | 206 | ||
@@ -899,7 +903,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
899 | public void ResetChildPrimPhysicsPositions() | 903 | public void ResetChildPrimPhysicsPositions() |
900 | { | 904 | { |
901 | AbsolutePosition = AbsolutePosition; // could someone in the know please explain how this works? | 905 | AbsolutePosition = AbsolutePosition; // could someone in the know please explain how this works? |
902 | //HasGroupChanged = false; | ||
903 | } | 906 | } |
904 | 907 | ||
905 | public UUID GetPartsFullID(uint localID) | 908 | public UUID GetPartsFullID(uint localID) |
@@ -1090,10 +1093,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1090 | { | 1093 | { |
1091 | part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim); | 1094 | part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim); |
1092 | } | 1095 | } |
1093 | 1096 | ||
1094 | // Hack to get the physics scene geometries in the right spot | 1097 | // Hack to get the physics scene geometries in the right spot |
1095 | ResetChildPrimPhysicsPositions(); | 1098 | ResetChildPrimPhysicsPositions(); |
1096 | } | 1099 | } |
1097 | } | 1100 | } |
1098 | else | 1101 | else |
1099 | { | 1102 | { |
@@ -2706,5 +2709,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
2706 | part.TriggerScriptChangedEvent(val); | 2709 | part.TriggerScriptChangedEvent(val); |
2707 | } | 2710 | } |
2708 | } | 2711 | } |
2712 | |||
2713 | public override string ToString() | ||
2714 | { | ||
2715 | return String.Format("{0} {1} ({2})", Name, UUID, AbsolutePosition); | ||
2716 | } | ||
2709 | } | 2717 | } |
2710 | } | 2718 | } |