diff options
author | Melanie Thielker | 2008-09-21 21:47:00 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-21 21:47:00 +0000 |
commit | 94aaf67dfaafbcbd4d871f674c465a34c1c1f332 (patch) | |
tree | 33476e5660a95bdf7d29d14beae67a6294af28a7 /OpenSim/Region/Environment/Scenes/EventManager.cs | |
parent | * minor: warnings removal (diff) | |
download | opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.zip opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.gz opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.bz2 opensim-SC-94aaf67dfaafbcbd4d871f674c465a34c1c1f332.tar.xz |
Change the scirpt engine loading mechanism. Script engines are now
ordinary region modules and are able to coexist in one instance.
See http://opensimulator.org/wiki/ScriptEngines for details. There were
changes to OpenSim.ini.example, please note DefaultScriptEngine.
Also see the User docs and FAQ on the Wiki. Default is DotNetEngine.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index 58f5efe..42cbdfc 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -95,7 +95,7 @@ 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, UUID itemID, string script, int startParam, bool postOnRez); | 98 | public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine); |
99 | 99 | ||
100 | public event NewRezScript OnRezScript; | 100 | public event NewRezScript OnRezScript; |
101 | 101 | ||
@@ -519,12 +519,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
519 | } | 519 | } |
520 | } | 520 | } |
521 | 521 | ||
522 | public void TriggerRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez) | 522 | public void TriggerRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine) |
523 | { | 523 | { |
524 | handlerRezScript = OnRezScript; | 524 | handlerRezScript = OnRezScript; |
525 | if (handlerRezScript != null) | 525 | if (handlerRezScript != null) |
526 | { | 526 | { |
527 | handlerRezScript(localID, itemID, script, startParam, postOnRez); | 527 | handlerRezScript(localID, itemID, script, startParam, |
528 | postOnRez, engine); | ||
528 | } | 529 | } |
529 | } | 530 | } |
530 | 531 | ||