diff options
Diffstat (limited to 'OpenSim/Server/Base')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 10 |
1 files changed, 8 insertions, 2 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. |