diff options
author | Kitto Flora | 2011-01-04 21:36:09 +0000 |
---|---|---|
committer | Kitto Flora | 2011-01-04 21:36:09 +0000 |
commit | ba7a2277633804eb2d5e449efa0895e9f43a4ece (patch) | |
tree | 950d41b6bed87f6eccf295111b638d3138250993 /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-ba7a2277633804eb2d5e449efa0895e9f43a4ece.zip opensim-SC_OLD-ba7a2277633804eb2d5e449efa0895e9f43a4ece.tar.gz opensim-SC_OLD-ba7a2277633804eb2d5e449efa0895e9f43a4ece.tar.bz2 opensim-SC_OLD-ba7a2277633804eb2d5e449efa0895e9f43a4ece.tar.xz |
Revise Materials properties; Fix Double-Click Autopilot; Allow non-script sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 6 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 613d704..47492ea 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3019,8 +3019,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3019 | // http://bugs.meta7.com/view.php?id=28 | 3019 | // http://bugs.meta7.com/view.php?id=28 |
3020 | // - Tom | 3020 | // - Tom |
3021 | 3021 | ||
3022 | LSL_Rotation newrot = llGetRot() * llRotBetween(new LSL_Vector(1.0d, 0.0d, 0.0d) * llGetRot(), new LSL_Vector(0.0d, 0.0d, -1.0d)); | 3022 | /* And the following does not do the job either. It has to be performed inside the ODE glue-code. -.- .._. |
3023 | LSL_Rotation newrot = llGetRot() * llRotBetween(new LSL_Vector(1.0d, 0.0d, 0.0d) * llGetRot(), new LSL_Vector(0.0d, 0.0d, -1.0d)); | ||
3023 | llSetRot(newrot * llRotBetween(new LSL_Vector(0.0d,0.0d,1.0d) * newrot, target - llGetPos())); | 3024 | llSetRot(newrot * llRotBetween(new LSL_Vector(0.0d,0.0d,1.0d) * newrot, target - llGetPos())); |
3025 | */ | ||
3026 | // Send the target vector to RotLookAt method inside a 'rotation', the .w -99.9 value indicates it is really a LookAt. | ||
3027 | Quaternion q = new Quaternion((float)target.x, (float)target.y, (float)target.z, -99.9f); | ||
3028 | m_host.RotLookAt(q, (float)strength, (float)damping); | ||
3024 | 3029 | ||
3025 | } | 3030 | } |
3026 | 3031 | ||