diff options
| author | Arthur Valadares | 2009-08-25 10:28:22 -0300 |
|---|---|---|
| committer | Arthur Valadares | 2009-08-25 10:28:22 -0300 |
| commit | 9c9fa51b0f005f570df2e3e3b84dfa3974935995 (patch) | |
| tree | 49553fb3d3513f826f360eb426e1be7242a92aaf /OpenSim/Grid/MessagingServer | |
| parent | Adds osDrawPolygon to OSSL. Works a little different then other OS Drawing fu... (diff) | |
| parent | Closed the web request and stream in SynchronousRestSessionObjectPoster -- ma... (diff) | |
| download | opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.zip opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.gz opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.bz2 opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
Diffstat (limited to 'OpenSim/Grid/MessagingServer')
| -rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index c8035a4..f2631a7 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
| @@ -65,6 +65,7 @@ namespace OpenSim.Grid.MessagingServer | |||
| 65 | { | 65 | { |
| 66 | ArgvConfigSource argvSource = new ArgvConfigSource(args); | 66 | ArgvConfigSource argvSource = new ArgvConfigSource(args); |
| 67 | argvSource.AddSwitch("Startup", "console", "c"); | 67 | argvSource.AddSwitch("Startup", "console", "c"); |
| 68 | argvSource.AddSwitch("Startup", "xmlfile", "x"); | ||
| 68 | 69 | ||
| 69 | IConfig startupConfig = argvSource.Configs["Startup"]; | 70 | IConfig startupConfig = argvSource.Configs["Startup"]; |
| 70 | if (startupConfig != null) | 71 | if (startupConfig != null) |