diff options
| author | Melanie Thielker | 2008-09-25 17:54:44 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-09-25 17:54:44 +0000 |
| commit | f926d917cbf14d59f663be254dc107603da187af (patch) | |
| tree | 760bfdcbea46cbcdaaa0ec7a852f9d74435f4afc /OpenSim/Region | |
| parent | Add an extension to allow registering multiple interfaces of a type with (diff) | |
| download | opensim-SC_OLD-f926d917cbf14d59f663be254dc107603da187af.zip opensim-SC_OLD-f926d917cbf14d59f663be254dc107603da187af.tar.gz opensim-SC_OLD-f926d917cbf14d59f663be254dc107603da187af.tar.bz2 opensim-SC_OLD-f926d917cbf14d59f663be254dc107603da187af.tar.xz | |
Fix script engine name parsing for DotNetEngine to make that actually work
Add a reference for Windows builds
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 0308169..deb995b 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
| @@ -240,7 +240,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
| 240 | } | 240 | } |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | if (engine != "DotNetEngine") | 243 | if (engine != myScriptEngine.ScriptEngineName) |
| 244 | return; | 244 | return; |
| 245 | 245 | ||
| 246 | myScriptEngine.Log.Debug("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + | 246 | myScriptEngine.Log.Debug("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index f11ccc4..3a06462 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -359,7 +359,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 359 | } | 359 | } |
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | if (engine != "XEngine") | 362 | if (engine != ScriptEngineName) |
| 363 | return; | 363 | return; |
| 364 | 364 | ||
| 365 | Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez}; | 365 | Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez}; |