diff options
| author | Melanie | 2013-01-11 23:52:48 +0100 |
|---|---|---|
| committer | Melanie | 2013-01-11 23:52:48 +0100 |
| commit | 6e9092421b2f047dca26fc560d12a629f1177319 (patch) | |
| tree | 80b847237c67810798d1b8c852b61f543ee290b2 /OpenSim/Region/ScriptEngine | |
| parent | Change IsRoot to use ReferenceEquals to prevent operator == messiness (diff) | |
| parent | make sure keyframe rotations are normalized (diff) | |
| download | opensim-SC_OLD-6e9092421b2f047dca26fc560d12a629f1177319.zip opensim-SC_OLD-6e9092421b2f047dca26fc560d12a629f1177319.tar.gz opensim-SC_OLD-6e9092421b2f047dca26fc560d12a629f1177319.tar.bz2 opensim-SC_OLD-6e9092421b2f047dca26fc560d12a629f1177319.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0dfcfd6..1e1e574 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -12691,7 +12691,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12691 | if ((data & KeyframeMotion.DataFormat.Rotation) != 0) | 12691 | if ((data & KeyframeMotion.DataFormat.Rotation) != 0) |
| 12692 | { | 12692 | { |
| 12693 | LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++); | 12693 | LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++); |
| 12694 | frame.Rotation = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s); | 12694 | Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s); |
| 12695 | q.Normalize(); | ||
| 12696 | frame.Rotation = q; | ||
| 12695 | } | 12697 | } |
| 12696 | 12698 | ||
| 12697 | float tempf = (float)frames.GetLSLFloatItem(idx++); | 12699 | float tempf = (float)frames.GetLSLFloatItem(idx++); |