diff options
Diffstat (limited to 'OpenSim/Framework/AssetLoader')
-rw-r--r-- | OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 0cc10c4..945163c 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | protected AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage) | 46 | protected static AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage) |
47 | { | 47 | { |
48 | AssetBase asset = new AssetBase( | 48 | AssetBase asset = new AssetBase( |
49 | new LLUUID(assetIdStr), | 49 | new LLUUID(assetIdStr), |
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
64 | return asset; | 64 | return asset; |
65 | } | 65 | } |
66 | 66 | ||
67 | protected void LoadAsset(AssetBase info, bool image, string path) | 67 | protected static void LoadAsset(AssetBase info, bool image, string path) |
68 | { | 68 | { |
69 | FileInfo fInfo = new FileInfo(path); | 69 | FileInfo fInfo = new FileInfo(path); |
70 | long numBytes = fInfo.Length; | 70 | long numBytes = fInfo.Length; |
@@ -119,9 +119,9 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
119 | /// <summary> | 119 | /// <summary> |
120 | /// Use the asset set information at path to load assets | 120 | /// Use the asset set information at path to load assets |
121 | /// </summary> | 121 | /// </summary> |
122 | /// <param name="path"></param> | 122 | /// <param name="assetSetPath"></param> |
123 | /// <param name="assets"></param> | 123 | /// <param name="assets"></param> |
124 | protected void LoadXmlAssetSet(string assetSetPath, List<AssetBase> assets) | 124 | protected static void LoadXmlAssetSet(string assetSetPath, List<AssetBase> assets) |
125 | { | 125 | { |
126 | m_log.InfoFormat("[ASSETS]: Loading asset set {0}", assetSetPath); | 126 | m_log.InfoFormat("[ASSETS]: Loading asset set {0}", assetSetPath); |
127 | 127 | ||