From 9e545c9984790ddeabba0bf86e229af90da09ad6 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 6 Sep 2008 14:58:23 +0000 Subject: Mantis #2133 Thank you, Xugu Madison and ChrisDown, for a patch that fixes linux filename extensions from .Xml back to .xml --- OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 4 ++-- OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 2 +- OpenSim/Framework/Communications/InventoryServiceBase.cs | 2 +- OpenSim/Framework/Communications/UserManagerBase.cs | 2 +- OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | 2 +- OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | 2 +- OpenSim/Framework/EstateSettings.cs | 2 +- OpenSim/Framework/PluginLoader.cs | 2 +- OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | 6 +++--- OpenSim/Framework/RegionSettings.cs | 2 +- OpenSim/Framework/Servers/BaseHttpServer.cs | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) (limited to 'OpenSim/Framework') 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 public void ForEachDefaultXmlAsset(Action action) { - string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.Xml"); + string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml"); ForEachDefaultXmlAsset(assetSetFilename, action); } @@ -118,7 +118,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem } else { - m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.Xml does not exist! No assets loaded."); + m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.xml does not exist! No assets loaded."); } 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 libraryFolders.Add(ID, this); - LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.Xml")); + LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); // CreateLibraryItems(); } 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 new PluginLoader (new InventoryDataInitialiser (connect)); // loader will try to load all providers (MySQL, MSSQL, etc) - // unless it is constrainted to the correct "Provider" entry in the addin.Xml + // unless it is constrainted to the correct "Provider" entry in the addin.xml loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); loader.Load(); 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 new PluginLoader (new UserDataInitialiser (connect)); // loader will try to load all providers (MySQL, MSSQL, etc) - // unless it is constrainted to the correct "Provider" entry in the addin.Xml + // unless it is constrainted to the correct "Provider" entry in the addin.xml loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); loader.Load(); 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 public HTTPConfiguration() { - remoteConfigSettings = new RemoteConfigSettings("remoteconfig.Xml"); + remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml"); xmlConfig = new XmlConfiguration(); } 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 { rootNode = doc.SelectSingleNode("Root"); if (null == rootNode) - throw new Exception("Error: Invalid .Xml File. Missing "); + throw new Exception("Error: Invalid .xml File. Missing "); configNode = rootNode.SelectSingleNode("Config"); 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 // configMember = new ConfigurationMember(Path.Combine(Util.configDir(), - "estate_settings.Xml"), "ESTATE SETTINGS", + "estate_settings.xml"), "ESTATE SETTINGS", loadConfigurationOptions, handleIncomingConfiguration, true); 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 } /// - /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.Xml + /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml /// public class PluginProviderFilter : IPluginFilter { 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 Directory.CreateDirectory(regionConfigPath); } - string[] configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); + string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); if (configFiles.Length == 0) { - new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.Xml"), false); - configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); + new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false); + configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); } 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 { if (configMember == null) { - configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.Xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); + configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); configMember.performConfigurationRetrieve(); } } 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 // We'd like to put this into a text file parhaps that's easily editable. // // For this test to work, I used the following secondlife.exe parameters - // "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 + // "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 // // Even after all that, there's still an error, but it's a start. // -- cgit v1.1