From 7665aad002ef066fc31fa9497225d2668641c769 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 22 Feb 2010 13:27:17 -0800
Subject: * 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

---
 OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs     | 4 ++--
 OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/Rest/Inventory')

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
                 modified = (asset != null);
                 created  = !modified;
 
-                asset             = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")));
+                asset             = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero);
                 asset.Description = xml.GetAttribute("desc");
                 asset.Local       = Int32.Parse(xml.GetAttribute("local")) != 0;
                 asset.Temporary   = Int32.Parse(xml.GetAttribute("temporary")) != 0;
@@ -338,7 +338,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             modified = (asset != null);
             created  = !modified;
 
-            asset             = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")));
+            asset             = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero);
             asset.Description = xml.GetAttribute("desc");
             asset.Local       = Int32.Parse(xml.GetAttribute("local")) != 0;
             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
 
                 // Create AssetBase entity to hold the inlined asset
 
-                asset = new AssetBase(uuid, name, type);
+                asset = new AssetBase(uuid, name, type, UUID.Zero);
 
                 asset.Description = desc;
                 asset.Local       = local;
-- 
cgit v1.1