aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-07 20:45:29 +0000
committerMelanie Thielker2009-07-07 20:45:29 +0000
commitf10e53d167888991d7cc9469256e972b72ebae68 (patch)
treea3307001a51a1ac6a503d4014a83311e9472165a
parentB.U.S.T. Implant #1. Add inventory services to B.U.S.T. (diff)
downloadopensim-SC_OLD-f10e53d167888991d7cc9469256e972b72ebae68.zip
opensim-SC_OLD-f10e53d167888991d7cc9469256e972b72ebae68.tar.gz
opensim-SC_OLD-f10e53d167888991d7cc9469256e972b72ebae68.tar.bz2
opensim-SC_OLD-f10e53d167888991d7cc9469256e972b72ebae68.tar.xz
Update prompt and make it settable from within the ini file
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs2
-rw-r--r--OpenSim/Server/ServerMain.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index e1cdf66..757b2c1 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -136,6 +136,8 @@ namespace OpenSim.Server.Base
136 startupConfig = m_Config.Configs["Startup"]; 136 startupConfig = m_Config.Configs["Startup"];
137 } 137 }
138 138
139 prompt = startupConfig.GetString("Prompt", prompt);
140
139 // Allow derived classes to load config before the console is 141 // Allow derived classes to load config before the console is
140 // opened. 142 // opened.
141 // 143 //
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 2beca3b..5db2779 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Server
48 48
49 static int Main(string[] args) 49 static int Main(string[] args)
50 { 50 {
51 m_Server = new HttpServerBase("Server", args); 51 m_Server = new HttpServerBase("B.U.S.T.", args);
52 52
53 IConfig serverConfig = m_Server.Config.Configs["Startup"]; 53 IConfig serverConfig = m_Server.Config.Configs["Startup"];
54 if (serverConfig == null) 54 if (serverConfig == null)