aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/MessagingServer/Main.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-21 11:01:23 -0700
committerDiva Canto2009-08-21 11:01:23 -0700
commitf9ee8be2bce8dd894f0db33f152c872695ac839d (patch)
treef3d09cb58ffe68ac95f9e4197435f4d837d00ded /OpenSim/Grid/MessagingServer/Main.cs
parentAdded a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObj... (diff)
parentFix Messaging server so -xmlfile actually works (diff)
downloadopensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.zip
opensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.tar.gz
opensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.tar.bz2
opensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Grid/MessagingServer/Main.cs')
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 654e770..f2631a7 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -59,16 +59,19 @@ 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 {
65 ArgvConfigSource argvSource = new ArgvConfigSource(args); 66 ArgvConfigSource argvSource = new ArgvConfigSource(args);
66 argvSource.AddSwitch("Startup", "console", "c"); 67 argvSource.AddSwitch("Startup", "console", "c");
68 argvSource.AddSwitch("Startup", "xmlfile", "x");
67 69
68 IConfig startupConfig = argvSource.Configs["Startup"]; 70 IConfig startupConfig = argvSource.Configs["Startup"];
69 if (startupConfig != null) 71 if (startupConfig != null)
70 { 72 {
71 m_consoleType = startupConfig.GetString("console", "local"); 73 m_consoleType = startupConfig.GetString("console", "local");
74 m_configFile = startupConfig.GetString("xmlfile", "MessagingServer_Config.xml");
72 } 75 }
73 76
74 m_config = argvSource; 77 m_config = argvSource;
@@ -164,7 +167,7 @@ namespace OpenSim.Grid.MessagingServer
164 167
165 protected override void StartupSpecific() 168 protected override void StartupSpecific()
166 { 169 {
167 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 170 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), m_configFile)));
168 171
169 m_userDataBaseService = new UserDataBaseService(); 172 m_userDataBaseService = new UserDataBaseService();
170 m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); 173 m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);