aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/ServicesServerBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index d7d1306..1f2c54d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -82,7 +82,9 @@ namespace OpenSim.Server.Base
82 argvConfig.AddSwitch("Startup", "logconfig", "g"); 82 argvConfig.AddSwitch("Startup", "logconfig", "g");
83 83
84 // Automagically create the ini file name 84 // Automagically create the ini file name
85 string fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); 85 string fileName = "";
86 if (Assembly.GetEntryAssembly() != null)
87 fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
86 string iniFile = fileName + ".ini"; 88 string iniFile = fileName + ".ini";
87 string logConfig = null; 89 string logConfig = null;
88 90
@@ -158,7 +160,11 @@ namespace OpenSim.Server.Base
158 MainConsole.Instance = new RemoteConsole(prompt); 160 MainConsole.Instance = new RemoteConsole(prompt);
159 ((RemoteConsole)MainConsole.Instance).ReadConfig(Config); 161 ((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
160 } 162 }
161 else 163 else if (consoleType == "mock")
164 {
165 MainConsole.Instance = new MockConsole();
166 }
167 else if (consoleType == "local")
162 { 168 {
163 MainConsole.Instance = new LocalConsole(prompt, startupConfig); 169 MainConsole.Instance = new LocalConsole(prompt, startupConfig);
164 } 170 }