diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index 4855d64..84ccafe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
| @@ -218,16 +218,14 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 218 | } | 218 | } |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | Position = new LSL_Types.Vector3(part.AbsolutePosition.X, | 221 | Vector3 absPos = part.AbsolutePosition; |
| 222 | part.AbsolutePosition.Y, | 222 | Position = new LSL_Types.Vector3(absPos.X, absPos.Y, absPos.Z); |
| 223 | part.AbsolutePosition.Z); | ||
| 224 | 223 | ||
| 225 | Quaternion wr = part.ParentGroup.GroupRotation; | 224 | Quaternion wr = part.ParentGroup.Rotation; |
| 226 | Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); | 225 | Rotation = new LSL_Types.Quaternion(wr.X, wr.Y, wr.Z, wr.W); |
| 227 | 226 | ||
| 228 | Velocity = new LSL_Types.Vector3(part.Velocity.X, | 227 | Vector3 vel = part.Velocity; |
| 229 | part.Velocity.Y, | 228 | Velocity = new LSL_Types.Vector3(vel.X, vel.Y, vel.Z); |
| 230 | part.Velocity.Z); | ||
| 231 | } | 229 | } |
| 232 | } | 230 | } |
| 233 | 231 | ||