diff options
author | Melanie | 2009-08-21 11:35:40 +0100 |
---|---|---|
committer | Melanie | 2009-08-21 11:35:40 +0100 |
commit | 7daf6dbbd3ae70f43793c360bc3ab08efd89e850 (patch) | |
tree | 18a76a8f5000ede58c34044c3db35c7dd07d77a5 /OpenSim/Grid/MessagingServer/Main.cs | |
parent | Add copyright header. Formatting cleanup. (diff) | |
download | opensim-SC-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.zip opensim-SC-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.gz opensim-SC-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.bz2 opensim-SC-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.xz |
Add -xmlfile= option to UGM, to let the files be outside bin if desired
Diffstat (limited to 'OpenSim/Grid/MessagingServer/Main.cs')
-rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index 654e770..c8035a4 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
@@ -59,6 +59,7 @@ namespace OpenSim.Grid.MessagingServer | |||
59 | 59 | ||
60 | protected static string m_consoleType = "local"; | 60 | protected static string m_consoleType = "local"; |
61 | protected static IConfigSource m_config = null; | 61 | protected static IConfigSource m_config = null; |
62 | protected static string m_configFile = "MessagingServer_Config.xml"; | ||
62 | 63 | ||
63 | public static void Main(string[] args) | 64 | public static void Main(string[] args) |
64 | { | 65 | { |
@@ -69,6 +70,7 @@ namespace OpenSim.Grid.MessagingServer | |||
69 | if (startupConfig != null) | 70 | if (startupConfig != null) |
70 | { | 71 | { |
71 | m_consoleType = startupConfig.GetString("console", "local"); | 72 | m_consoleType = startupConfig.GetString("console", "local"); |
73 | m_configFile = startupConfig.GetString("xmlfile", "MessagingServer_Config.xml"); | ||
72 | } | 74 | } |
73 | 75 | ||
74 | m_config = argvSource; | 76 | m_config = argvSource; |
@@ -164,7 +166,7 @@ namespace OpenSim.Grid.MessagingServer | |||
164 | 166 | ||
165 | protected override void StartupSpecific() | 167 | protected override void StartupSpecific() |
166 | { | 168 | { |
167 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); | 169 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), m_configFile))); |
168 | 170 | ||
169 | m_userDataBaseService = new UserDataBaseService(); | 171 | m_userDataBaseService = new UserDataBaseService(); |
170 | m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); | 172 | m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); |