From 65c5efe43b68700bad94076d4cd421160203c5de Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 01:22:11 +0000 Subject: Formatting cleanup. --- .../AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Framework/AssetLoader') diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 945163c..7adcb4a 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs @@ -38,7 +38,7 @@ using Nini.Config; /// Loads assets from the filesystem location. Not yet a plugin, though it should be. /// namespace OpenSim.Framework.AssetLoader.Filesystem -{ +{ public class AssetLoaderFileSystem : IAssetLoader { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -63,7 +63,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem return asset; } - + protected static void LoadAsset(AssetBase info, bool image, string path) { FileInfo fInfo = new FileInfo(path); @@ -77,7 +77,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem info.Data = idata; //info.loaded=true; } - + public void ForEachDefaultXmlAsset(Action action) { string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml"); @@ -91,28 +91,28 @@ namespace OpenSim.Framework.AssetLoader.Filesystem if (File.Exists(assetSetFilename)) { string assetSetPath = "ERROR"; - + try { XmlConfigSource source = new XmlConfigSource(assetSetFilename); - + for (int i = 0; i < source.Configs.Count; i++) { assetSetPath = source.Configs[i].GetString("file", String.Empty); - + LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets); } } catch (XmlException e) { m_log.ErrorFormat("[ASSETS]: Error loading {0} : {1}", assetSetPath, e); - } + } } else { m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.xml does not exist! No assets loaded."); } - + assets.ForEach(action); } @@ -124,7 +124,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem protected static void LoadXmlAssetSet(string assetSetPath, List assets) { m_log.InfoFormat("[ASSETS]: Loading asset set {0}", assetSetPath); - + if (File.Exists(assetSetPath)) { try @@ -156,6 +156,6 @@ namespace OpenSim.Framework.AssetLoader.Filesystem { m_log.ErrorFormat("[ASSETS]: Asset set file {0} does not exist!", assetSetPath); } - } + } } } -- cgit v1.1