diff options
| author | John Hurliman | 2009-11-05 13:10:58 -0800 |
|---|---|---|
| committer | John Hurliman | 2009-11-05 13:10:58 -0800 |
| commit | afef1ac191d32e9c1514c294b17e404b1d4ae217 (patch) | |
| tree | c390ef81c9c30922c2e95e32844832919884fd9c /OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |
| parent | Applying #4332, optional packet statistics logging (diff) | |
| download | opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.zip opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.gz opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.bz2 opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.xz | |
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
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); |