aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2013-01-13 13:44:28 +0000
committerMelanie2013-01-13 13:44:28 +0000
commitb924e333b771d95f12612278f096d37f73927b7a (patch)
tree9d311c0afe76f5957d7f797be144db505cfb0c2a /OpenSim/Region/ScriptEngine
parentMerge branch 'master' into careminster (diff)
parentadd some sanity checking to HandleAgentRequestSit handler (diff)
downloadopensim-SC-b924e333b771d95f12612278f096d37f73927b7a.zip
opensim-SC-b924e333b771d95f12612278f096d37f73927b7a.tar.gz
opensim-SC-b924e333b771d95f12612278f096d37f73927b7a.tar.bz2
opensim-SC-b924e333b771d95f12612278f096d37f73927b7a.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-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 9ae9b59..4ce2afd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12689,7 +12689,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12689 if ((data & KeyframeMotion.DataFormat.Rotation) != 0) 12689 if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
12690 { 12690 {
12691 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++); 12691 LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
12692 frame.Rotation = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s); 12692 Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
12693 q.Normalize();
12694 frame.Rotation = q;
12693 } 12695 }
12694 12696
12695 float tempf = (float)frames.GetLSLFloatItem(idx++); 12697 float tempf = (float)frames.GetLSLFloatItem(idx++);