aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-26 15:44:14 +0000
committerMelanie Thielker2008-09-26 15:44:14 +0000
commit0313a1d43979275d226a3418da8c5abccf55e563 (patch)
tree5ac573dcc4624a26ad218c70872cb3e7874d9953 /OpenSim
parentYay! Common/ is gone! One API is achieved! (diff)
downloadopensim-SC_OLD-0313a1d43979275d226a3418da8c5abccf55e563.zip
opensim-SC_OLD-0313a1d43979275d226a3418da8c5abccf55e563.tar.gz
opensim-SC_OLD-0313a1d43979275d226a3418da8c5abccf55e563.tar.bz2
opensim-SC_OLD-0313a1d43979275d226a3418da8c5abccf55e563.tar.xz
After the last commit, the old Common assembly was still being loaded.
Removing it made DNE scripts crash. Fixed here. Now on to converge the compilers.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
index e37b18e..5a77d39 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -148,8 +148,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
148 148
149 AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads); 149 AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads);
150 m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain Loading: " + 150 m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain Loading: " +
151 AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll").ToString()); 151 AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Shared.dll").ToString());
152 AD.Load(AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll")); 152 AD.Load(AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Shared.dll"));
153 153
154 // Return the new AppDomain 154 // Return the new AppDomain
155 return AD; 155 return AD;