aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-25 17:54:44 +0000
committerMelanie Thielker2008-09-25 17:54:44 +0000
commitf926d917cbf14d59f663be254dc107603da187af (patch)
tree760bfdcbea46cbcdaaa0ec7a852f9d74435f4afc
parentAdd an extension to allow registering multiple interfaces of a type with (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
-rw-r--r--prebuild.xml1
3 files changed, 3 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};
diff --git a/prebuild.xml b/prebuild.xml
index c8fe1e4..78b6913 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1996,6 +1996,7 @@
1996 <Reference name="OpenSim.Framework"/> 1996 <Reference name="OpenSim.Framework"/>
1997 <Reference name="OpenSim.Framework.Console"/> 1997 <Reference name="OpenSim.Framework.Console"/>
1998 <Reference name="OpenSim.Region.Environment" /> 1998 <Reference name="OpenSim.Region.Environment" />
1999 <Reference name="OpenSim.Region.Interfaces" />
1999 <Reference name="OpenSim.Region.ScriptEngine.Common"/> 2000 <Reference name="OpenSim.Region.ScriptEngine.Common"/>
2000 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 2001 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2001 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> 2002 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/>