From 57519b6dba97d7e7a2de71af9d58c93b4750bde8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 16 Jan 2008 18:35:34 +0000
Subject: * Store task inventory when an object is taken into agent inventory *
 This means that you can take an object from a region and rez it somewhere
 else, with its inventory intact. * As for earlier, at this stage only scripts
 can be placed in inventory * This isn't an efficient implementation, a better
 one will probably need to come along soonish

---
 .../Environment/Scenes/SceneObjectGroup.Inventory.cs   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index a092f5b..c7f5852 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -169,14 +169,14 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 TaskInventoryItem taskItem = new TaskInventoryItem();
                 
-                taskItem.item_id = newItemId;                
-                taskItem.asset_id = item.assetID;
-                taskItem.name = item.inventoryName;
-                taskItem.desc = item.inventoryDescription;
-                taskItem.owner_id = item.avatarID;
-                taskItem.creator_id = item.creatorsID;
-                taskItem.type = item.assetType;
-                taskItem.inv_type = item.invType;
+                taskItem.ItemID = newItemId;                
+                taskItem.AssetID = item.assetID;
+                taskItem.Name = item.inventoryName;
+                taskItem.Description = item.inventoryDescription;
+                taskItem.OwnerID = item.avatarID;
+                taskItem.CreatorID = item.creatorsID;
+                taskItem.Type = item.assetType;
+                taskItem.InvType = item.invType;
                 part.AddInventoryItem(taskItem);
                 
                 // It might seem somewhat crude to update the whole group for a single prim inventory change,
@@ -250,7 +250,7 @@ namespace OpenSim.Region.Environment.Scenes
                 MainLog.Instance.Error(
                     "PRIMINVENTORY",
                     "Couldn't find prim ID {0} to update item {1}, {2}",
-                    item.ParentPartID, item.name, item.item_id);
+                    item.ParentPartID, item.Name, item.ItemID);
             }   
             
             return false;
-- 
cgit v1.1