diff options
author | Charles Krinke | 2008-06-28 16:08:12 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-28 16:08:12 +0000 |
commit | 9a0ef22ed979433f4d017a252173f38fe5e56892 (patch) | |
tree | 98bd25e3a49a38922b37728df4de9e0fa5b7366a /OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |
parent | plumbing for multiple inventory servers. Mostly done on the region server side. (diff) | |
download | opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.zip opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.gz opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.bz2 opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.xz |
Mantis#1616. Applied Melanie's patch. This may or may
not break trunk.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/EventManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 8bfef79..3fd4942 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -53,7 +53,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
53 | myScriptEngine.Log.Info("[XEngine] Hooking up to server events"); | 53 | myScriptEngine.Log.Info("[XEngine] Hooking up to server events"); |
54 | myScriptEngine.World.EventManager.OnObjectGrab += touch_start; | 54 | myScriptEngine.World.EventManager.OnObjectGrab += touch_start; |
55 | myScriptEngine.World.EventManager.OnObjectDeGrab += touch_end; | 55 | myScriptEngine.World.EventManager.OnObjectDeGrab += touch_end; |
56 | myScriptEngine.World.EventManager.OnRezEvent += on_rez; | ||
57 | myScriptEngine.World.EventManager.OnScriptChangedEvent += changed; | 56 | myScriptEngine.World.EventManager.OnScriptChangedEvent += changed; |
58 | myScriptEngine.World.EventManager.OnScriptAtTargetEvent += at_target; | 57 | myScriptEngine.World.EventManager.OnScriptAtTargetEvent += at_target; |
59 | myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target; | 58 | myScriptEngine.World.EventManager.OnScriptNotAtTargetEvent += not_at_target; |
@@ -254,14 +253,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
254 | // timer: not handled here | 253 | // timer: not handled here |
255 | // listen: not handled here | 254 | // listen: not handled here |
256 | 255 | ||
257 | public void on_rez(uint localID, LLUUID itemID, int startParam) | ||
258 | { | ||
259 | myScriptEngine.PostObjectEvent(localID, new EventParams( | ||
260 | "on_rez",new object[] { | ||
261 | new LSL_Types.LSLInteger(startParam)}, | ||
262 | new DetectParams[0])); | ||
263 | } | ||
264 | |||
265 | public void control(uint localID, LLUUID itemID, LLUUID agentID, uint held, uint change) | 256 | public void control(uint localID, LLUUID itemID, LLUUID agentID, uint held, uint change) |
266 | { | 257 | { |
267 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 258 | myScriptEngine.PostObjectEvent(localID, new EventParams( |