diff options
author | diva | 2009-06-08 17:50:17 +0000 |
---|---|---|
committer | diva | 2009-06-08 17:50:17 +0000 |
commit | b43fc318fb6c50a0c78843f04c2fb07e3bc5d283 (patch) | |
tree | 91b7ab6385044ba19969548c872791dd3d8e5cc7 /OpenSim/Server | |
parent | Making the prompt configurable in the server shell. Default is "Server". (diff) | |
download | opensim-SC-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.zip opensim-SC-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.tar.gz opensim-SC-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.tar.bz2 opensim-SC-b43fc318fb6c50a0c78843f04c2fb07e3bc5d283.tar.xz |
That didn't quite work. Trying this instead -- prompt given in the cmd line.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 10 | ||||
-rw-r--r-- | OpenSim/Server/ServerMain.cs | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 6f7c938..e1cdf66 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -79,6 +79,7 @@ namespace OpenSim.Server.Base | |||
79 | argvConfig.AddSwitch("Startup", "console", "c"); | 79 | argvConfig.AddSwitch("Startup", "console", "c"); |
80 | argvConfig.AddSwitch("Startup", "logfile", "l"); | 80 | argvConfig.AddSwitch("Startup", "logfile", "l"); |
81 | argvConfig.AddSwitch("Startup", "inifile", "i"); | 81 | argvConfig.AddSwitch("Startup", "inifile", "i"); |
82 | argvConfig.AddSwitch("Startup", "prompt", "p"); | ||
82 | 83 | ||
83 | // Automagically create the ini file name | 84 | // Automagically create the ini file name |
84 | // | 85 | // |
@@ -87,11 +88,16 @@ namespace OpenSim.Server.Base | |||
87 | 88 | ||
88 | string iniFile = assemblyName.Name + ".ini"; | 89 | string iniFile = assemblyName.Name + ".ini"; |
89 | 90 | ||
90 | // Check if a file name was given on the command line | ||
91 | // | ||
92 | IConfig startupConfig = argvConfig.Configs["Startup"]; | 91 | IConfig startupConfig = argvConfig.Configs["Startup"]; |
93 | if (startupConfig != null) | 92 | if (startupConfig != null) |
93 | { | ||
94 | // Check if a file name was given on the command line | ||
95 | // | ||
94 | iniFile = startupConfig.GetString("inifile", iniFile); | 96 | iniFile = startupConfig.GetString("inifile", iniFile); |
97 | // | ||
98 | // Check if a prompt was given on the command line | ||
99 | prompt = startupConfig.GetString("prompt", prompt); | ||
100 | } | ||
95 | 101 | ||
96 | // Find out of the file name is a URI and remote load it | 102 | // Find out of the file name is a URI and remote load it |
97 | // if it's possible. Load it as a local file otherwise. | 103 | // if it's possible. Load it as a local file otherwise. |
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 | ||