diff options
| author | John Hurliman | 2010-02-22 13:27:17 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 13:27:17 -0800 |
| commit | 7665aad002ef066fc31fa9497225d2668641c769 (patch) | |
| tree | ce2ad89f1ffd20c6f5e9a3b6558f7b90c651c830 /OpenSim/ApplicationPlugins/Rest | |
| parent | * Added a sanity check for missing asset data in LLClientView (diff) | |
| download | opensim-SC_OLD-7665aad002ef066fc31fa9497225d2668641c769.zip opensim-SC_OLD-7665aad002ef066fc31fa9497225d2668641c769.tar.gz opensim-SC_OLD-7665aad002ef066fc31fa9497225d2668641c769.tar.bz2 opensim-SC_OLD-7665aad002ef066fc31fa9497225d2668641c769.tar.xz | |
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | 4 | ||||
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index 66572d5..54ce80e 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |||
| @@ -261,7 +261,7 @@ 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(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type"))); | 264 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero); |
| 265 | asset.Description = xml.GetAttribute("desc"); | 265 | asset.Description = xml.GetAttribute("desc"); |
| 266 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 266 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
| 267 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 267 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
| @@ -338,7 +338,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 338 | modified = (asset != null); | 338 | modified = (asset != null); |
| 339 | created = !modified; | 339 | created = !modified; |
| 340 | 340 | ||
| 341 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type"))); | 341 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero); |
| 342 | asset.Description = xml.GetAttribute("desc"); | 342 | asset.Description = xml.GetAttribute("desc"); |
| 343 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 343 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
| 344 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 344 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index fb1d739..9ab2763 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
| @@ -1871,7 +1871,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 1871 | 1871 | ||
| 1872 | // Create AssetBase entity to hold the inlined asset | 1872 | // Create AssetBase entity to hold the inlined asset |
| 1873 | 1873 | ||
| 1874 | asset = new AssetBase(uuid, name, type); | 1874 | asset = new AssetBase(uuid, name, type, UUID.Zero); |
| 1875 | 1875 | ||
| 1876 | asset.Description = desc; | 1876 | asset.Description = desc; |
| 1877 | asset.Local = local; | 1877 | asset.Local = local; |