diff options
author | idb | 2008-12-05 16:48:47 +0000 |
---|---|---|
committer | idb | 2008-12-05 16:48:47 +0000 |
commit | 7ae9ec217d6e1ec039fbd6ed16c952d56cc63dc6 (patch) | |
tree | 6fed56271b075ef0c9c42e3cc899e86e54ea4c25 /OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs | |
parent | Fixed Mantis #2756 (diff) | |
download | opensim-SC_OLD-7ae9ec217d6e1ec039fbd6ed16c952d56cc63dc6.zip opensim-SC_OLD-7ae9ec217d6e1ec039fbd6ed16c952d56cc63dc6.tar.gz opensim-SC_OLD-7ae9ec217d6e1ec039fbd6ed16c952d56cc63dc6.tar.bz2 opensim-SC_OLD-7ae9ec217d6e1ec039fbd6ed16c952d56cc63dc6.tar.xz |
Implementation of the llDetectedTouch* functions
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs index a2f855c..0641613 100644 --- a/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs +++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Events/LSLEventProvider.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Events | |||
84 | RezScript(localID, itemID, script, startParam, postOnRez, engine); | 84 | RezScript(localID, itemID, script, startParam, postOnRez, engine); |
85 | } | 85 | } |
86 | 86 | ||
87 | private void OnObjectGrab(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient) | 87 | private void OnObjectGrab(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) |
88 | { | 88 | { |
89 | // Add to queue for all scripts in ObjectID object | 89 | // Add to queue for all scripts in ObjectID object |
90 | DetectParams[] det = new DetectParams[1]; | 90 | DetectParams[] det = new DetectParams[1]; |
@@ -108,7 +108,10 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Events | |||
108 | CurrentRegion.Scene.GetSceneObjectPart(originalID); | 108 | CurrentRegion.Scene.GetSceneObjectPart(originalID); |
109 | det[0].LinkNum = originalPart.LinkNum; | 109 | det[0].LinkNum = originalPart.LinkNum; |
110 | } | 110 | } |
111 | 111 | if (surfaceArgs != null) | |
112 | { | ||
113 | det[0].SurfaceTouchArgs = surfaceArgs; | ||
114 | } | ||
112 | Shared.EventParams ep = | 115 | Shared.EventParams ep = |
113 | new Shared.EventParams(localID, "touch_start", new Object[] {new LSL_Types.LSLInteger(1)}, det); | 116 | new Shared.EventParams(localID, "touch_start", new Object[] {new LSL_Types.LSLInteger(1)}, det); |
114 | CurrentRegion.Executors_Execute(ep); | 117 | CurrentRegion.Executors_Execute(ep); |