diff options
-rw-r--r-- | OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/AssetService/XAssetService.cs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 097ad7d..efccc35 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | |||
@@ -42,11 +42,13 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
42 | public class AssetLoaderFileSystem : IAssetLoader | 42 | public class AssetLoaderFileSystem : IAssetLoader |
43 | { | 43 | { |
44 | private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000"); | 44 | private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000"); |
45 | private static readonly string LIBRARY_OWNER_IDstr = "11111111-1111-0000-0000-000100bba000"; | ||
46 | |||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 48 | ||
47 | protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type) | 49 | protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type) |
48 | { | 50 | { |
49 | AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID.ToString()); | 51 | AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_IDstr); |
50 | 52 | ||
51 | if (!String.IsNullOrEmpty(path)) | 53 | if (!String.IsNullOrEmpty(path)) |
52 | { | 54 | { |
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 5c37c33..ee2e568 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -82,7 +82,7 @@ namespace OpenSim.Services.AssetService | |||
82 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) | 82 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) |
83 | { | 83 | { |
84 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); | 84 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); |
85 | Store(a); | 85 | m_Database.StoreAsset(a); |
86 | } | 86 | } |
87 | }); | 87 | }); |
88 | } | 88 | } |
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index 9490d55..de7223b 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Services.AssetService | |||
80 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) | 80 | if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data)) |
81 | { | 81 | { |
82 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); | 82 | // m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID); |
83 | Store(a); | 83 | m_Database.StoreAsset(a); |
84 | } | 84 | } |
85 | }); | 85 | }); |
86 | } | 86 | } |