diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup.cs index b04340a..93fbe74 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup.cs | |||
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
173 | { | 173 | { |
174 | switch (direction) | 174 | switch (direction) |
175 | { | 175 | { |
176 | case UpdateType.InComingNewPosition: | 176 | case UpdateType.GroupPositionEdit: |
177 | this.m_pos = new LLVector3(pos.X, pos.Y, pos.Z); | 177 | this.m_pos = new LLVector3(pos.X, pos.Y, pos.Z); |
178 | pos.X = 0; | 178 | pos.X = 0; |
179 | pos.Y = 0; | 179 | pos.Y = 0; |
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs index 21659c4..b91e04a 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs | |||
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
12 | public enum UpdateType | 12 | public enum UpdateType |
13 | { | 13 | { |
14 | OutGoingOffset, | 14 | OutGoingOffset, |
15 | InComingNewPosition, | 15 | GroupPositionEdit, |
16 | SinglePositionEdit, | 16 | SinglePositionEdit, |
17 | ResizeOffset, | 17 | ResizeOffset, |
18 | SingleRotationEdit | 18 | SingleRotationEdit |
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
139 | this.m_localID = (uint)(localID); | 139 | this.m_localID = (uint)(localID); |
140 | this.m_Shape = shape; | 140 | this.m_Shape = shape; |
141 | 141 | ||
142 | this.UpdateHandler(ref position, UpdateType.InComingNewPosition, this); | 142 | this.UpdateHandler(ref position, UpdateType.GroupPositionEdit, this); |
143 | this.OffsetPosition = position; | 143 | this.OffsetPosition = position; |
144 | } | 144 | } |
145 | #endregion | 145 | #endregion |
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
191 | public void UpdateGroupPosition(LLVector3 pos) | 191 | public void UpdateGroupPosition(LLVector3 pos) |
192 | { | 192 | { |
193 | LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z); | 193 | LLVector3 newPos = new LLVector3(pos.X, pos.Y, pos.Z); |
194 | this.UpdateHandler(ref newPos, UpdateType.InComingNewPosition, this); | 194 | this.UpdateHandler(ref newPos, UpdateType.GroupPositionEdit, this); |
195 | this.OffsetPosition = newPos; | 195 | this.OffsetPosition = newPos; |
196 | } | 196 | } |
197 | 197 | ||
@@ -217,7 +217,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
217 | public void UpdateGroupMouseRotation(LLVector3 pos, LLQuaternion rot) | 217 | public void UpdateGroupMouseRotation(LLVector3 pos, LLQuaternion rot) |
218 | { | 218 | { |
219 | this.RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W); | 219 | this.RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W); |
220 | this.UpdateHandler(ref pos, UpdateType.InComingNewPosition, this); | 220 | this.UpdateHandler(ref pos, UpdateType.GroupPositionEdit, this); |
221 | this.OffsetPosition = pos; | 221 | this.OffsetPosition = pos; |
222 | } | 222 | } |
223 | 223 | ||