diff options
author | Melanie | 2009-10-02 00:47:01 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 00:47:01 +0100 |
commit | 212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e (patch) | |
tree | 5af4731fb69cb8546a9cfb857dabbebc5f0b6ee1 /OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |
parent | Fix a merge conflict (diff) | |
download | opensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.zip opensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.gz opensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.bz2 opensim-SC-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.xz |
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index 84ccafe..4855d64 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
@@ -218,14 +218,16 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
218 | } | 218 | } |
219 | } | 219 | } |
220 | 220 | ||
221 | Vector3 absPos = part.AbsolutePosition; | 221 | Position = new LSL_Types.Vector3(part.AbsolutePosition.X, |
222 | Position = new LSL_Types.Vector3(absPos.X, absPos.Y, absPos.Z); | 222 | part.AbsolutePosition.Y, |
223 | part.AbsolutePosition.Z); | ||
223 | 224 | ||
224 | Quaternion wr = part.ParentGroup.Rotation; | 225 | Quaternion wr = part.ParentGroup.GroupRotation; |
225 | Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); | 226 | Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); |
226 | 227 | ||
227 | Vector3 vel = part.Velocity; | 228 | Velocity = new LSL_Types.Vector3(part.Velocity.X, |
228 | Velocity = new LSL_Types.Vector3(vel.X, vel.Y, vel.Z); | 229 | part.Velocity.Y, |
230 | part.Velocity.Z); | ||
229 | } | 231 | } |
230 | } | 232 | } |
231 | 233 | ||