diff options
| author | John Hurliman | 2010-02-22 14:18:59 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 14:18:59 -0800 |
| commit | df76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch) | |
| tree | 74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/Region/CoreModules/World/Archiver | |
| parent | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff) | |
| download | opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.zip opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.gz opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.bz2 opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.xz | |
Changed asset CreatorID to a string
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 f5eda3a..40d6b23 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -347,7 +347,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 347 | 347 | ||
| 348 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); | 348 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); |
| 349 | 349 | ||
| 350 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero); | 350 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero.ToString()); |
| 351 | asset.Data = data; | 351 | asset.Data = data; |
| 352 | 352 | ||
| 353 | // We're relying on the asset service to do the sensible thing and not store the asset if it already | 353 | // 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 8601cae..2c04008 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, UUID.Zero); | 161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType, UUID.Zero.ToString()); |
| 162 | asset.Description = metadata.Description; | 162 | asset.Description = metadata.Description; |
| 163 | asset.Data = data; | 163 | asset.Data = data; |
| 164 | 164 | ||