aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorMelanie2009-12-20 16:45:28 +0000
committerMelanie2009-12-20 16:45:28 +0000
commit3d3e0ea4f38b343edc19b7530fbac28b84b53ecf (patch)
treeb22a6e71dca45c15f98df996182239186259b6d3 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentMerge branch 'casper' (diff)
parentFix a case where an idle sim can eat 100% of a core (diff)
downloadopensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.zip
opensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.gz
opensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.bz2
opensim-SC_OLD-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e694f15..2da498a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4476,8 +4476,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4476 4476
4477 double x, y, z, s, t; 4477 double x, y, z, s, t;
4478 4478
4479 s = Math.Cos(angle / 2); 4479 s = Math.Cos(angle * 0.5);
4480 t = Math.Sin(angle / 2); // temp value to avoid 2 more sin() calcs 4480 t = Math.Sin(angle * 0.5); // temp value to avoid 2 more sin() calcs
4481 x = axis.x * t; 4481 x = axis.x * t;
4482 y = axis.y * t; 4482 y = axis.y * t;
4483 z = axis.z * t; 4483 z = axis.z * t;