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/Framework | |
parent | * Replace a Try/catch I commented out while testing/fixing issues. (diff) | |
download | opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.zip opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.gz opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.bz2 opensim-SC-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 '')
11 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 73489ec..cf601f1 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
88 | 88 | ||
89 | public void ForEachDefaultXmlAsset(Action<AssetBase> action) | 89 | public void ForEachDefaultXmlAsset(Action<AssetBase> action) |
90 | { | 90 | { |
91 | string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.Xml"); | 91 | string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml"); |
92 | 92 | ||
93 | ForEachDefaultXmlAsset(assetSetFilename, action); | 93 | ForEachDefaultXmlAsset(assetSetFilename, action); |
94 | } | 94 | } |
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
118 | } | 118 | } |
119 | else | 119 | else |
120 | { | 120 | { |
121 | m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.Xml does not exist! No assets loaded."); | 121 | m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.xml does not exist! No assets loaded."); |
122 | } | 122 | } |
123 | 123 | ||
124 | assets.ForEach(action); | 124 | assets.ForEach(action); |
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 7e561b5..88047c2 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
66 | 66 | ||
67 | libraryFolders.Add(ID, this); | 67 | libraryFolders.Add(ID, this); |
68 | 68 | ||
69 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.Xml")); | 69 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); |
70 | 70 | ||
71 | // CreateLibraryItems(); | 71 | // CreateLibraryItems(); |
72 | } | 72 | } |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 3239268..e9dc3c4 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications | |||
57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); | 57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); |
58 | 58 | ||
59 | // loader will try to load all providers (MySQL, MSSQL, etc) | 59 | // loader will try to load all providers (MySQL, MSSQL, etc) |
60 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 60 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); | 61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); |
62 | loader.Load(); | 62 | loader.Load(); |
63 | 63 | ||
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 5a63e70..b6564bf 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Communications | |||
59 | new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); | 59 | new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); |
60 | 60 | ||
61 | // loader will try to load all providers (MySQL, MSSQL, etc) | 61 | // loader will try to load all providers (MySQL, MSSQL, etc) |
62 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 62 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
63 | loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); | 63 | loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); |
64 | loader.Load(); | 64 | loader.Load(); |
65 | 65 | ||
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index 0929172..4770017 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Configuration.HTTP | |||
47 | 47 | ||
48 | public HTTPConfiguration() | 48 | public HTTPConfiguration() |
49 | { | 49 | { |
50 | remoteConfigSettings = new RemoteConfigSettings("remoteconfig.Xml"); | 50 | remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml"); |
51 | xmlConfig = new XmlConfiguration(); | 51 | xmlConfig = new XmlConfiguration(); |
52 | } | 52 | } |
53 | 53 | ||
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index e3da962..89f52cf 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Configuration.XML | |||
48 | { | 48 | { |
49 | rootNode = doc.SelectSingleNode("Root"); | 49 | rootNode = doc.SelectSingleNode("Root"); |
50 | if (null == rootNode) | 50 | if (null == rootNode) |
51 | throw new Exception("Error: Invalid .Xml File. Missing <Root>"); | 51 | throw new Exception("Error: Invalid .xml File. Missing <Root>"); |
52 | 52 | ||
53 | configNode = rootNode.SelectSingleNode("Config"); | 53 | configNode = rootNode.SelectSingleNode("Config"); |
54 | if (null == configNode) | 54 | if (null == configNode) |
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 83f911d..8921c6d 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -281,7 +281,7 @@ namespace OpenSim.Framework | |||
281 | // | 281 | // |
282 | configMember = | 282 | configMember = |
283 | new ConfigurationMember(Path.Combine(Util.configDir(), | 283 | new ConfigurationMember(Path.Combine(Util.configDir(), |
284 | "estate_settings.Xml"), "ESTATE SETTINGS", | 284 | "estate_settings.xml"), "ESTATE SETTINGS", |
285 | loadConfigurationOptions, | 285 | loadConfigurationOptions, |
286 | handleIncomingConfiguration, true); | 286 | handleIncomingConfiguration, true); |
287 | 287 | ||
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs index 366552f..cabce1b 100644 --- a/OpenSim/Framework/PluginLoader.cs +++ b/OpenSim/Framework/PluginLoader.cs | |||
@@ -342,7 +342,7 @@ namespace OpenSim.Framework | |||
342 | } | 342 | } |
343 | 343 | ||
344 | /// <summary> | 344 | /// <summary> |
345 | /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.Xml | 345 | /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml |
346 | /// </summary> | 346 | /// </summary> |
347 | public class PluginProviderFilter : IPluginFilter | 347 | public class PluginProviderFilter : IPluginFilter |
348 | { | 348 | { |
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs index c7d317f..a371851 100644 --- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs +++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | |||
@@ -59,12 +59,12 @@ namespace OpenSim.Framework.RegionLoader.Filesystem | |||
59 | Directory.CreateDirectory(regionConfigPath); | 59 | Directory.CreateDirectory(regionConfigPath); |
60 | } | 60 | } |
61 | 61 | ||
62 | string[] configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); | 62 | string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); |
63 | 63 | ||
64 | if (configFiles.Length == 0) | 64 | if (configFiles.Length == 0) |
65 | { | 65 | { |
66 | new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.Xml"), false); | 66 | new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false); |
67 | configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); | 67 | configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); |
68 | } | 68 | } |
69 | 69 | ||
70 | RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; | 70 | RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; |
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 525a3f0..5eb7209 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Framework | |||
45 | { | 45 | { |
46 | if (configMember == null) | 46 | if (configMember == null) |
47 | { | 47 | { |
48 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.Xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); | 48 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); |
49 | configMember.performConfigurationRetrieve(); | 49 | configMember.performConfigurationRetrieve(); |
50 | } | 50 | } |
51 | } | 51 | } |
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 3787c38..72c9ca1 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -709,7 +709,7 @@ namespace OpenSim.Framework.Servers | |||
709 | // We'd like to put this into a text file parhaps that's easily editable. | 709 | // We'd like to put this into a text file parhaps that's easily editable. |
710 | // | 710 | // |
711 | // For this test to work, I used the following secondlife.exe parameters | 711 | // For this test to work, I used the following secondlife.exe parameters |
712 | // "C:\Program Files\SecondLifeWindLight\SecondLifeWindLight.exe" -settings settings_windlight.Xml -channel "Second Life WindLight" -set SystemLanguage en-us -loginpage http://10.1.1.2:8002/?show_login_form=TRUE -loginuri http://10.1.1.2:8002 -user 10.1.1.2 | 712 | // "C:\Program Files\SecondLifeWindLight\SecondLifeWindLight.exe" -settings settings_windlight.xml -channel "Second Life WindLight" -set SystemLanguage en-us -loginpage http://10.1.1.2:8002/?show_login_form=TRUE -loginuri http://10.1.1.2:8002 -user 10.1.1.2 |
713 | // | 713 | // |
714 | // Even after all that, there's still an error, but it's a start. | 714 | // Even after all that, there's still an error, but it's a start. |
715 | // | 715 | // |