aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-08-13 19:56:48 +0000
committerMW2007-08-13 19:56:48 +0000
commitfc82bd8de7ba544dc89f4703ffc03f5d8f1304e1 (patch)
tree35909f10cdd21b9e7fdc1e6bc13608c4299f5cfe /OpenSim/Region
parent(DotNet) ScriptEngine is now loaded and added to Scene during startup. (diff)
downloadopensim-SC_OLD-fc82bd8de7ba544dc89f4703ffc03f5d8f1304e1.zip
opensim-SC_OLD-fc82bd8de7ba544dc89f4703ffc03f5d8f1304e1.tar.gz
opensim-SC_OLD-fc82bd8de7ba544dc89f4703ffc03f5d8f1304e1.tar.bz2
opensim-SC_OLD-fc82bd8de7ba544dc89f4703ffc03f5d8f1304e1.tar.xz
Changed ScriptLoader to use Path.combine.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 2f0551c..4b912e4 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -28,6 +28,7 @@
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO;
31using System.Text; 32using System.Text;
32using System.Reflection; 33using System.Reflection;
33 34
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
41 42
42 public ScriptEngineInterface LoadScriptEngine(string EngineName) 43 public ScriptEngineInterface LoadScriptEngine(string EngineName)
43 { 44 {
44 return LoadAndInitAssembly(@"ScriptEngines\OpenSim.Region.ScriptEngine." + EngineName + ".dll", 45 return LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
45 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine"); 46 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
46 } 47 }
47 48