aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorubit2013-01-11 21:27:23 +0100
committerubit2013-01-11 21:27:23 +0100
commite5c63f8174b8b129ce4b8ae216d39406815c3689 (patch)
tree308bb877710ee05a6cd3ad2240bf4bfae2d91512 /OpenSim/Region
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentmake sure keyframe rotations are normalized (diff)
downloadopensim-SC-e5c63f8174b8b129ce4b8ae216d39406815c3689.zip
opensim-SC-e5c63f8174b8b129ce4b8ae216d39406815c3689.tar.gz
opensim-SC-e5c63f8174b8b129ce4b8ae216d39406815c3689.tar.bz2
opensim-SC-e5c63f8174b8b129ce4b8ae216d39406815c3689.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
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++);