diff options
| author | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
| commit | 7f5d0a6735585d47e081cb0b717de46d5e23260d (patch) | |
| tree | d463176be6e07c4bb6948f428958fe7452866758 /OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |
| parent | refactor out iar escaping (diff) | |
| parent | remove the debug stuff (diff) | |
| download | opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 5208e7a..2d2c570 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
| @@ -158,9 +158,8 @@ 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); | 161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType); |
| 162 | asset.Description = metadata.Description; | 162 | asset.Description = metadata.Description; |
| 163 | asset.Type = metadata.AssetType; | ||
| 164 | asset.Data = data; | 163 | asset.Data = data; |
| 165 | 164 | ||
| 166 | m_cache.Store(asset); | 165 | m_cache.Store(asset); |