diff options
author | Melanie | 2012-08-18 19:01:05 +0100 |
---|---|---|
committer | Melanie | 2012-08-18 19:01:05 +0100 |
commit | 914f97cb761842b9e5627adde78fe36eccc753bd (patch) | |
tree | e1eebb8ebd92ee8019f7bfd9262d88501e5aaf38 /OpenSim/Region/ScriptEngine/XEngine | |
parent | Merge branch 'master' into careminster (diff) | |
parent | integrating redundant code into operator (diff) | |
download | opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.zip opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.tar.gz opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.tar.bz2 opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index a1ad07d..cee10df 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -391,8 +391,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
391 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 391 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
392 | "at_rot_target", new object[] { | 392 | "at_rot_target", new object[] { |
393 | new LSL_Types.LSLInteger(handle), | 393 | new LSL_Types.LSLInteger(handle), |
394 | new LSL_Types.Quaternion(targetrot.X,targetrot.Y,targetrot.Z,targetrot.W), | 394 | new LSL_Types.Quaternion(targetrot), |
395 | new LSL_Types.Quaternion(atrot.X,atrot.Y,atrot.Z,atrot.W) }, | 395 | new LSL_Types.Quaternion(atrot) }, |
396 | new DetectParams[0])); | 396 | new DetectParams[0])); |
397 | } | 397 | } |
398 | 398 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index eee5d7b..f5ad990 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1558,7 +1558,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1558 | else if (p[i] is Vector3) | 1558 | else if (p[i] is Vector3) |
1559 | lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]); | 1559 | lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]); |
1560 | else if (p[i] is Quaternion) | 1560 | else if (p[i] is Quaternion) |
1561 | lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W); | 1561 | lsl_p[i] = new LSL_Types.Quaternion((Quaternion)p[i]); |
1562 | else if (p[i] is float) | 1562 | else if (p[i] is float) |
1563 | lsl_p[i] = new LSL_Types.LSLFloat((float)p[i]); | 1563 | lsl_p[i] = new LSL_Types.LSLFloat((float)p[i]); |
1564 | else | 1564 | else |
@@ -1584,7 +1584,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1584 | else if (p[i] is Vector3) | 1584 | else if (p[i] is Vector3) |
1585 | lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]); | 1585 | lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]); |
1586 | else if (p[i] is Quaternion) | 1586 | else if (p[i] is Quaternion) |
1587 | lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W); | 1587 | lsl_p[i] = new LSL_Types.Quaternion((Quaternion)p[i]); |
1588 | else if (p[i] is float) | 1588 | else if (p[i] is float) |
1589 | lsl_p[i] = new LSL_Types.LSLFloat((float)p[i]); | 1589 | lsl_p[i] = new LSL_Types.LSLFloat((float)p[i]); |
1590 | else | 1590 | else |