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/Services/Connectors | |
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 '')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index ecda85a..8e311d7 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
@@ -243,7 +243,7 @@ namespace OpenSim.Services.Connectors | |||
243 | if (metadata == null) | 243 | if (metadata == null) |
244 | return false; | 244 | return false; |
245 | 245 | ||
246 | asset = new AssetBase(); | 246 | asset = new AssetBase(metadata.FullID, metadata.Name, metadata.Type); |
247 | asset.Metadata = metadata; | 247 | asset.Metadata = metadata; |
248 | } | 248 | } |
249 | asset.Data = data; | 249 | asset.Data = data; |
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs index 3d7f112..2f33bab 100644 --- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | |||
@@ -140,12 +140,11 @@ namespace OpenSim.Services.Connectors.Grid | |||
140 | Bitmap m = new Bitmap(info.RegionID.ToString() + ".jpg"); | 140 | Bitmap m = new Bitmap(info.RegionID.ToString() + ".jpg"); |
141 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); | 141 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); |
142 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); | 142 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); |
143 | AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString()); | 143 | AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString(), (sbyte)AssetType.Texture); |
144 | 144 | ||
145 | // !!! for now | 145 | // !!! for now |
146 | //info.RegionSettings.TerrainImageID = ass.FullID; | 146 | //info.RegionSettings.TerrainImageID = ass.FullID; |
147 | 147 | ||
148 | ass.Type = (int)AssetType.Texture; | ||
149 | ass.Temporary = true; | 148 | ass.Temporary = true; |
150 | ass.Local = true; | 149 | ass.Local = true; |
151 | ass.Data = imageData; | 150 | ass.Data = imageData; |