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/EventManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | integrating redundant code into operator (diff) | |
| download | opensim-SC-914f97cb761842b9e5627adde78fe36eccc753bd.zip opensim-SC-914f97cb761842b9e5627adde78fe36eccc753bd.tar.gz opensim-SC-914f97cb761842b9e5627adde78fe36eccc753bd.tar.bz2 opensim-SC-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/EventManager.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 4 |
1 files changed, 2 insertions, 2 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 | ||