aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTedd Hansen2008-02-24 17:01:20 +0000
committerTedd Hansen2008-02-24 17:01:20 +0000
commitf10d895105452d5713b963fb4ed20af9bf85df9e (patch)
treea8301a3b2ab5b0211e2f9143ce9cb3261cc2d1e7 /OpenSim/Region
parentBy now you all have learned that when I'm committing scripting usually doesn'... (diff)
downloadopensim-SC_OLD-f10d895105452d5713b963fb4ed20af9bf85df9e.zip
opensim-SC_OLD-f10d895105452d5713b963fb4ed20af9bf85df9e.tar.gz
opensim-SC_OLD-f10d895105452d5713b963fb4ed20af9bf85df9e.tar.bz2
opensim-SC_OLD-f10d895105452d5713b963fb4ed20af9bf85df9e.tar.xz
Ok, so NOW scripts work. New patch to break them coming soon.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
3 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 59f7c63..3fba35c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -300,9 +300,9 @@ namespace OpenSim
300 // Called from app startup (OpenSim.Application) 300 // Called from app startup (OpenSim.Application)
301 // 301 //
302 302
303 m_log.Info("========================================================================"); 303 m_log.Info("=====================================================================");
304 m_log.Info("=========================== STARTING OPENSIM ==========================="); 304 m_log.Info("========================= STARTING OPENSIM ==========================");
305 m_log.Info("========================================================================"); 305 m_log.Info("=====================================================================");
306 306
307 m_console = CreateConsole(); 307 m_console = CreateConsole();
308 MainConsole.Instance = m_console; 308 MainConsole.Instance = m_console;
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index 80360ee..f112e58 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -40,11 +40,13 @@ namespace OpenSim.Region.ScriptEngine.Common
40 : base(scriptEngine, host, localID, itemID) 40 : base(scriptEngine, host, localID, itemID)
41 { 41 {
42 Prim = new OSSLPrim(this); 42 Prim = new OSSLPrim(this);
43
43 } 44 }
44 45
45 46
46 public OSSLPrim Prim; 47 public OSSLPrim Prim;
47 48
49 [Serializable]
48 public class OSSLPrim 50 public class OSSLPrim
49 { 51 {
50 private OSSL_BuilIn_Commands OSSL; 52 private OSSL_BuilIn_Commands OSSL;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index b0ddf37..e564b5d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
95 // this private copy will contain Read-Only FullitemID so that it can bring that on to the server whenever needed. 95 // this private copy will contain Read-Only FullitemID so that it can bring that on to the server whenever needed.
96 96
97 97
98 BuilIn_Commands LSLB = (BuilIn_Commands)new OSSL_BuilIn_Commands(m_scriptEngine, m_host, localID, itemID); 98 BuilIn_Commands LSLB = new BuilIn_Commands(m_scriptEngine, m_host, localID, itemID);
99 99
100 // Start the script - giving it BuiltIns 100 // Start the script - giving it BuiltIns
101 CompiledScript.Start(LSLB); 101 CompiledScript.Start(LSLB);