aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetLoader/Filesystem
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-06 14:58:23 +0000
committerMelanie Thielker2008-09-06 14:58:23 +0000
commit9e545c9984790ddeabba0bf86e229af90da09ad6 (patch)
treebf305b155bcd2aadc1fb8a209d262a86f676fca3 /OpenSim/Framework/AssetLoader/Filesystem
parent* Replace a Try/catch I commented out while testing/fixing issues. (diff)
downloadopensim-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 'OpenSim/Framework/AssetLoader/Filesystem')
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs4
1 files changed, 2 insertions, 2 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);