ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis #2133

Browse Source 
Thank you, Xugu Madison and ChrisDown, for a patch that
fixes linux filename extensions from .Xml back to .xml
This commit is contained in:
Melanie Thielker
2008-09-06 14:58:23 +00:00
parent f342bd1e96
commit 9e545c9984
28 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@@ -88,7 +88,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
public void ForEachDefaultXmlAsset(Action<AssetBase> 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);

2
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@@ -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();
}

2
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications
new PluginLoader<IInventoryDataPlugin> (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();

2
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Communications
new PluginLoader<IUserDataPlugin> (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();

2
OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
View File

@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Configuration.HTTP
public HTTPConfiguration()
{
remoteConfigSettings = new RemoteConfigSettings("remoteconfig.Xml");
remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");
xmlConfig = new XmlConfiguration();
}

2
OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
View File

@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Configuration.XML
{
rootNode = doc.SelectSingleNode("Root");
if (null == rootNode)
throw new Exception("Error: Invalid .Xml File. Missing <Root>");
throw new Exception("Error: Invalid .xml File. Missing <Root>");
configNode = rootNode.SelectSingleNode("Config");
if (null == configNode)

2
OpenSim/Framework/EstateSettings.cs
View File

@@ -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);

2
OpenSim/Framework/PluginLoader.cs
View File

@@ -342,7 +342,7 @@ namespace OpenSim.Framework
}
/// <summary>
/// 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
/// </summary>
public class PluginProviderFilter : IPluginFilter
{

6
OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
View File

@@ -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];

2
OpenSim/Framework/RegionSettings.cs
View File

@@ -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();
}
}

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -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.
//