diff options
author | Melanie Thielker | 2008-09-06 14:58:23 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-06 14:58:23 +0000 |
commit | 9e545c9984790ddeabba0bf86e229af90da09ad6 (patch) | |
tree | bf305b155bcd2aadc1fb8a209d262a86f676fca3 /OpenSim/Grid | |
parent | * Replace a Try/catch I commented out while testing/fixing issues. (diff) | |
download | opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.zip opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.gz opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.bz2 opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.xz |
Mantis #2133
Thank you, Xugu Madison and ChrisDown, for a patch that
fixes linux filename extensions from .Xml back to .xml
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index bded875..3f85691 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetServer | |||
119 | new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); | 119 | new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); |
120 | 120 | ||
121 | // loader will try to load all providers (MySQL, MSSQL, etc) | 121 | // loader will try to load all providers (MySQL, MSSQL, etc) |
122 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 122 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
123 | loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); | 123 | loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); |
124 | loader.Load(); | 124 | loader.Load(); |
125 | 125 | ||
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 6fbfc71..2e0767e 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Grid.GridServer | |||
68 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); | 68 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); |
69 | 69 | ||
70 | // loader will try to load all providers (MySQL, MSSQL, etc) | 70 | // loader will try to load all providers (MySQL, MSSQL, etc) |
71 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 71 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
72 | gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); | 72 | gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); |
73 | logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); | 73 | logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); |
74 | 74 | ||
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index f9be780..c73facb 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.MessagingServer | |||
84 | { | 84 | { |
85 | base.Startup(); | 85 | base.Startup(); |
86 | 86 | ||
87 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.Xml"))); | 87 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); |
88 | 88 | ||
89 | m_log.Info("[REGION]: Starting HTTP process"); | 89 | m_log.Info("[REGION]: Starting HTTP process"); |
90 | m_httpServer = new BaseHttpServer(Cfg.HttpPort); | 90 | m_httpServer = new BaseHttpServer(Cfg.HttpPort); |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 6441b7a..94e0728 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer | |||
92 | { | 92 | { |
93 | base.Startup(); | 93 | base.Startup(); |
94 | 94 | ||
95 | Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.Xml"))); | 95 | Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); |
96 | 96 | ||
97 | m_stats = StatsManager.StartCollectingUserStats(); | 97 | m_stats = StatsManager.StartCollectingUserStats(); |
98 | 98 | ||