diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index a6bb405..3fdfd8a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
117 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); | 117 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); |
118 | } | 118 | } |
119 | 119 | ||
120 | public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 120 | public void touch_start(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient) |
121 | { | 121 | { |
122 | // Add to queue for all scripts in ObjectID object | 122 | // Add to queue for all scripts in ObjectID object |
123 | EventQueueManager.Queue_llDetectParams_Struct detstruct = new EventQueueManager.Queue_llDetectParams_Struct(); | 123 | EventQueueManager.Queue_llDetectParams_Struct detstruct = new EventQueueManager.Queue_llDetectParams_Struct(); |
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
152 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_start", detstruct, new object[] { new LSL_Types.LSLInteger(1) }); | 152 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_start", detstruct, new object[] { new LSL_Types.LSLInteger(1) }); |
153 | } | 153 | } |
154 | 154 | ||
155 | public void touch_end(uint localID, IClientAPI remoteClient) | 155 | public void touch_end(uint localID, uint originalID, IClientAPI remoteClient) |
156 | { | 156 | { |
157 | // Add to queue for all scripts in ObjectID object | 157 | // Add to queue for all scripts in ObjectID object |
158 | EventQueueManager.Queue_llDetectParams_Struct detstruct = new EventQueueManager.Queue_llDetectParams_Struct(); | 158 | EventQueueManager.Queue_llDetectParams_Struct detstruct = new EventQueueManager.Queue_llDetectParams_Struct(); |
@@ -220,12 +220,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
220 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_exit", EventQueueManager.llDetectNull, new object[] { }); | 220 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "state_exit", EventQueueManager.llDetectNull, new object[] { }); |
221 | } | 221 | } |
222 | 222 | ||
223 | public void touch(uint localID, LLUUID itemID) | 223 | public void touch(uint localID, uint originalID, LLUUID itemID) |
224 | { | 224 | { |
225 | myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch", EventQueueManager.llDetectNull); | 225 | myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch", EventQueueManager.llDetectNull); |
226 | } | 226 | } |
227 | 227 | ||
228 | public void touch_end(uint localID, LLUUID itemID) | 228 | public void touch_end(uint localID, uint originalID, LLUUID itemID) |
229 | { | 229 | { |
230 | myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch_end", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(1) }); | 230 | myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "touch_end", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(1) }); |
231 | } | 231 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs index 9a465f6..41fde02 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs | |||
@@ -38,12 +38,12 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
38 | { | 38 | { |
39 | public interface RemoteEvents | 39 | public interface RemoteEvents |
40 | { | 40 | { |
41 | void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient); | 41 | void touch_start(uint localID, uint originalID, LLVector3 offsetPos, IClientAPI remoteClient); |
42 | void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez); | 42 | void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez); |
43 | void OnRemoveScript(uint localID, LLUUID itemID); | 43 | void OnRemoveScript(uint localID, LLUUID itemID); |
44 | void state_exit(uint localID); | 44 | void state_exit(uint localID); |
45 | void touch(uint localID, LLUUID itemID); | 45 | void touch(uint localID, uint originalID, LLUUID itemID); |
46 | void touch_end(uint localID, LLUUID itemID); | 46 | void touch_end(uint localID, uint originalID, LLUUID itemID); |
47 | void collision_start(uint localID, ColliderArgs col); | 47 | void collision_start(uint localID, ColliderArgs col); |
48 | void collision(uint localID, ColliderArgs col); | 48 | void collision(uint localID, ColliderArgs col); |
49 | void collision_end(uint localID, ColliderArgs col); | 49 | void collision_end(uint localID, ColliderArgs col); |