aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorTedd Hansen2007-08-18 21:10:40 +0000
committerTedd Hansen2007-08-18 21:10:40 +0000
commitf444fe4f87dd88b9c400c2b4efe9a050332c4f54 (patch)
tree06fff56f78ddc1b9ee1a6026bfe3a19e97b28005 /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
parentLSL Compiler now only referring required assemblies (DotNetEngine and Common)... (diff)
downloadopensim-SC_OLD-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.zip
opensim-SC_OLD-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.tar.gz
opensim-SC_OLD-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.tar.bz2
opensim-SC_OLD-f444fe4f87dd88b9c400c2b4efe9a050332c4f54.tar.xz
Moved OpenSim.Region.ScriptEngine.Common.dll from bin\ScriptEngine\ to bin\ folder - hopefully solves compile problem on Linux.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 2cbdfd3..8e0b277 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -35,6 +35,7 @@ using System.Runtime.Remoting;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Region.Environment.Scenes.Scripting; 36using OpenSim.Region.Environment.Scenes.Scripting;
37using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL; 37using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL;
38using OpenSim.Region.ScriptEngine.Common;
38 39
39namespace OpenSim.Region.ScriptEngine.DotNetEngine 40namespace OpenSim.Region.ScriptEngine.DotNetEngine
40{ 41{
@@ -227,14 +228,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
227 //LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceAndUnwrap(FileName, "SecondLife.Script"); 228 //LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceAndUnwrap(FileName, "SecondLife.Script");
228 Console.WriteLine("Base directory: " + AppDomain.CurrentDomain.BaseDirectory); 229 Console.WriteLine("Base directory: " + AppDomain.CurrentDomain.BaseDirectory);
229 230
230 LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script"); 231 //LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");
232 LSL_BuiltIn_Commands_Interface mbrt = (LSL_BuiltIn_Commands_Interface)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");
231 Type mytype = mbrt.GetType(); 233 Type mytype = mbrt.GetType();
232 234
233 Console.WriteLine("is proxy={0}", RemotingServices.IsTransparentProxy(mbrt)); 235 Console.WriteLine("is proxy={0}", RemotingServices.IsTransparentProxy(mbrt));
234 236
235 237
236 //mbrt.Start(); 238 //mbrt.Start();
237 return mbrt; 239 return (LSL_BaseClass)mbrt;
238 240
239 241
240 242