aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/ServerMain.cs
diff options
context:
space:
mode:
authordiva2009-06-08 17:50:17 +0000
committerdiva2009-06-08 17:50:17 +0000
commitb43fc318fb6c50a0c78843f04c2fb07e3bc5d283 (patch)
tree91b7ab6385044ba19969548c872791dd3d8e5cc7 /OpenSim/Server/ServerMain.cs
parentMaking the prompt configurable in the server shell. Default is "Server". (diff)
downloadopensim-SC_OLD-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.zip
opensim-SC_OLD-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.tar.gz
opensim-SC_OLD-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.tar.bz2
opensim-SC_OLD-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.tar.xz
That didn't quite work. Trying this instead -- prompt given in the cmd line.
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
-rw-r--r--OpenSim/Server/ServerMain.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index ae15e63..ee136f4 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -49,6 +49,8 @@ namespace OpenSim.Server
49 49
50 static int Main(string[] args) 50 static int Main(string[] args)
51 { 51 {
52 m_Server = new HttpServerBase("Server", args);
53
52 IConfig serverConfig = m_Server.Config.Configs["Startup"]; 54 IConfig serverConfig = m_Server.Config.Configs["Startup"];
53 if (serverConfig == null) 55 if (serverConfig == null)
54 { 56 {
@@ -56,10 +58,6 @@ namespace OpenSim.Server
56 throw new Exception("Configuration error"); 58 throw new Exception("Configuration error");
57 } 59 }
58 60
59 string prompt = serverConfig.GetString("Prompt", "Server");
60
61 m_Server = new HttpServerBase(prompt, args);
62
63 string connList = serverConfig.GetString("ServiceConnectors", String.Empty); 61 string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
64 string[] conns = connList.Split(new char[] {',', ' '}); 62 string[] conns = connList.Split(new char[] {',', ' '});
65 63