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/Environment/Scenes/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 '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index 5c750e4..f3af0d1 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -95,17 +95,22 @@ namespace OpenSim.Region.Environment.Scenes | |||
95 | 95 | ||
96 | public event OnPermissionErrorDelegate OnPermissionError; | 96 | public event OnPermissionErrorDelegate OnPermissionError; |
97 | 97 | ||
98 | public delegate void NewRezScript(uint localID, LLUUID itemID, string script); | 98 | public delegate void NewRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez); |
99 | public delegate void RezEvent(uint localID, LLUUID itemID, int param); | ||
100 | 99 | ||
101 | public event NewRezScript OnRezScript; | 100 | public event NewRezScript OnRezScript; |
102 | 101 | ||
103 | public event RezEvent OnRezEvent; | ||
104 | |||
105 | public delegate void RemoveScript(uint localID, LLUUID itemID); | 102 | public delegate void RemoveScript(uint localID, LLUUID itemID); |
106 | 103 | ||
107 | public event RemoveScript OnRemoveScript; | 104 | public event RemoveScript OnRemoveScript; |
108 | 105 | ||
106 | public delegate void StartScript(uint localID, LLUUID itemID); | ||
107 | |||
108 | public event StartScript OnStartScript; | ||
109 | |||
110 | public delegate void StopScript(uint localID, LLUUID itemID); | ||
111 | |||
112 | public event StopScript OnStopScript; | ||
113 | |||
109 | public delegate bool SceneGroupMoved(LLUUID groupID, LLVector3 delta); | 114 | public delegate bool SceneGroupMoved(LLUUID groupID, LLVector3 delta); |
110 | 115 | ||
111 | public event SceneGroupMoved OnSceneGroupMove; | 116 | public event SceneGroupMoved OnSceneGroupMove; |
@@ -332,8 +337,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
332 | private ObjectDeGrabDelegate handlerObjectDeGrab = null; //OnObjectDeGrab; | 337 | private ObjectDeGrabDelegate handlerObjectDeGrab = null; //OnObjectDeGrab; |
333 | private ScriptResetDelegate handlerScriptReset = null; // OnScriptReset | 338 | private ScriptResetDelegate handlerScriptReset = null; // OnScriptReset |
334 | private NewRezScript handlerRezScript = null; //OnRezScript; | 339 | private NewRezScript handlerRezScript = null; //OnRezScript; |
335 | private RezEvent handlerOnRezEvent = null; //OnRezEvent; | ||
336 | private RemoveScript handlerRemoveScript = null; //OnRemoveScript; | 340 | private RemoveScript handlerRemoveScript = null; //OnRemoveScript; |
341 | private StartScript handlerStartScript = null; //OnStartScript; | ||
342 | private StopScript handlerStopScript = null; //OnStopScript; | ||
337 | private SceneGroupMoved handlerSceneGroupMove = null; //OnSceneGroupMove; | 343 | private SceneGroupMoved handlerSceneGroupMove = null; //OnSceneGroupMove; |
338 | private SceneGroupGrabed handlerSceneGroupGrab = null; //OnSceneGroupGrab; | 344 | private SceneGroupGrabed handlerSceneGroupGrab = null; //OnSceneGroupGrab; |
339 | private LandObjectAdded handlerLandObjectAdded = null; //OnLandObjectAdded; | 345 | private LandObjectAdded handlerLandObjectAdded = null; //OnLandObjectAdded; |
@@ -523,21 +529,30 @@ namespace OpenSim.Region.Environment.Scenes | |||
523 | } | 529 | } |
524 | } | 530 | } |
525 | 531 | ||
526 | public void TriggerRezScript(uint localID, LLUUID itemID, string script) | 532 | public void TriggerRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez) |
527 | { | 533 | { |
528 | handlerRezScript = OnRezScript; | 534 | handlerRezScript = OnRezScript; |
529 | if (handlerRezScript != null) | 535 | if (handlerRezScript != null) |
530 | { | 536 | { |
531 | handlerRezScript(localID, itemID, script); | 537 | handlerRezScript(localID, itemID, script, startParam, postOnRez); |
538 | } | ||
539 | } | ||
540 | |||
541 | public void TriggerStartScript(uint localID, LLUUID itemID) | ||
542 | { | ||
543 | handlerStartScript = OnStartScript; | ||
544 | if (handlerStartScript != null) | ||
545 | { | ||
546 | handlerStartScript(localID, itemID); | ||
532 | } | 547 | } |
533 | } | 548 | } |
534 | 549 | ||
535 | public void TriggerOnRezEvent(uint localID, LLUUID itemID, int param) | 550 | public void TriggerStopScript(uint localID, LLUUID itemID) |
536 | { | 551 | { |
537 | handlerOnRezEvent = OnRezEvent; | 552 | handlerStopScript = OnStopScript; |
538 | if (handlerOnRezEvent != null) | 553 | if (handlerStopScript != null) |
539 | { | 554 | { |
540 | handlerOnRezEvent(localID, itemID, param); | 555 | handlerStopScript(localID, itemID); |
541 | } | 556 | } |
542 | } | 557 | } |
543 | 558 | ||