diff options
author | John Hurliman | 2010-02-22 13:27:17 -0800 |
---|---|---|
committer | John Hurliman | 2010-02-22 13:27:17 -0800 |
commit | 7665aad002ef066fc31fa9497225d2668641c769 (patch) | |
tree | ce2ad89f1ffd20c6f5e9a3b6558f7b90c651c830 /OpenSim/Region/CoreModules/World/Archiver | |
parent | * Added a sanity check for missing asset data in LLClientView (diff) | |
download | opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.zip opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.gz opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.bz2 opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.xz |
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 59a1b8f..c4b1817 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -335,7 +335,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
335 | 335 | ||
336 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); | 336 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); |
337 | 337 | ||
338 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType); | 338 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero); |
339 | asset.Data = data; | 339 | asset.Data = data; |
340 | 340 | ||
341 | // We're relying on the asset service to do the sensible thing and not store the asset if it already | 341 | // We're relying on the asset service to do the sensible thing and not store the asset if it already |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 2d2c570..8601cae 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
158 | 158 | ||
159 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); | 159 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); |
160 | 160 | ||
161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType); | 161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType, UUID.Zero); |
162 | asset.Description = metadata.Description; | 162 | asset.Description = metadata.Description; |
163 | asset.Data = data; | 163 | asset.Data = data; |
164 | 164 | ||