aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/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/UserServer/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/UserServer/Main.cs')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 1ee53ef..baf0fd3 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -76,16 +76,19 @@ namespace OpenSim.Grid.UserServer
76 76
77 protected static string m_consoleType = "local"; 77 protected static string m_consoleType = "local";
78 protected static IConfigSource m_config = null; 78 protected static IConfigSource m_config = null;
79 protected static string m_configFile = "UserServer_Config.xml";
79 80
80 public static void Main(string[] args) 81 public static void Main(string[] args)
81 { 82 {
82 ArgvConfigSource argvSource = new ArgvConfigSource(args); 83 ArgvConfigSource argvSource = new ArgvConfigSource(args);
83 argvSource.AddSwitch("Startup", "console", "c"); 84 argvSource.AddSwitch("Startup", "console", "c");
85 argvSource.AddSwitch("Startup", "xmlfile", "x");
84 86
85 IConfig startupConfig = argvSource.Configs["Startup"]; 87 IConfig startupConfig = argvSource.Configs["Startup"];
86 if (startupConfig != null) 88 if (startupConfig != null)
87 { 89 {
88 m_consoleType = startupConfig.GetString("console", "local"); 90 m_consoleType = startupConfig.GetString("console", "local");
91 m_configFile = startupConfig.GetString("xmlfile", "UserServer_Config.xml");
89 } 92 }
90 93
91 m_config = argvSource; 94 m_config = argvSource;
@@ -151,7 +154,7 @@ namespace OpenSim.Grid.UserServer
151 154
152 protected virtual IInterServiceInventoryServices StartupCoreComponents() 155 protected virtual IInterServiceInventoryServices StartupCoreComponents()
153 { 156 {
154 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 157 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), m_configFile)));
155 158
156 m_httpServer = new BaseHttpServer(Cfg.HttpPort); 159 m_httpServer = new BaseHttpServer(Cfg.HttpPort);
157 160