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