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/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |
| parent | Applying #4332, optional packet statistics logging (diff) | |
| download | opensim-SC-afef1ac191d32e9c1514c294b17e404b1d4ae217.zip opensim-SC-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.gz opensim-SC-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.bz2 opensim-SC-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/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index f862af1..66572d5 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |||
| @@ -261,11 +261,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 261 | modified = (asset != null); | 261 | modified = (asset != null); |
| 262 | created = !modified; | 262 | created = !modified; |
| 263 | 263 | ||
| 264 | asset = new AssetBase(); | 264 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type"))); |
| 265 | asset.FullID = uuid; | ||
| 266 | asset.Name = xml.GetAttribute("name"); | ||
| 267 | asset.Description = xml.GetAttribute("desc"); | 265 | asset.Description = xml.GetAttribute("desc"); |
| 268 | asset.Type = SByte.Parse(xml.GetAttribute("type")); | ||
| 269 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 266 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
| 270 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 267 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
| 271 | asset.Data = Convert.FromBase64String(xml.ReadElementContentAsString("Asset", "")); | 268 | asset.Data = Convert.FromBase64String(xml.ReadElementContentAsString("Asset", "")); |
| @@ -341,11 +338,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 341 | modified = (asset != null); | 338 | modified = (asset != null); |
| 342 | created = !modified; | 339 | created = !modified; |
| 343 | 340 | ||
| 344 | asset = new AssetBase(); | 341 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type"))); |
| 345 | asset.FullID = uuid; | ||
| 346 | asset.Name = xml.GetAttribute("name"); | ||
| 347 | asset.Description = xml.GetAttribute("desc"); | 342 | asset.Description = xml.GetAttribute("desc"); |
| 348 | asset.Type = SByte.Parse(xml.GetAttribute("type")); | ||
| 349 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 343 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
| 350 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 344 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
| 351 | asset.Data = Convert.FromBase64String(xml.ReadElementContentAsString("Asset", "")); | 345 | asset.Data = Convert.FromBase64String(xml.ReadElementContentAsString("Asset", "")); |