aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-16 18:35:34 +0000
committerJustin Clarke Casey2008-01-16 18:35:34 +0000
commit57519b6dba97d7e7a2de71af9d58c93b4750bde8 (patch)
tree9597647ee1e70e50215b90bb116fede1ca7f8e27 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
parentFirst part of changing prim's permission flags to use the correct enum (libsl... (diff)
downloadopensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.zip
opensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.tar.gz
opensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.tar.bz2
opensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs18
1 files changed, 9 insertions, 9 deletions
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
169 { 169 {
170 TaskInventoryItem taskItem = new TaskInventoryItem(); 170 TaskInventoryItem taskItem = new TaskInventoryItem();
171 171
172 taskItem.item_id = newItemId; 172 taskItem.ItemID = newItemId;
173 taskItem.asset_id = item.assetID; 173 taskItem.AssetID = item.assetID;
174 taskItem.name = item.inventoryName; 174 taskItem.Name = item.inventoryName;
175 taskItem.desc = item.inventoryDescription; 175 taskItem.Description = item.inventoryDescription;
176 taskItem.owner_id = item.avatarID; 176 taskItem.OwnerID = item.avatarID;
177 taskItem.creator_id = item.creatorsID; 177 taskItem.CreatorID = item.creatorsID;
178 taskItem.type = item.assetType; 178 taskItem.Type = item.assetType;
179 taskItem.inv_type = item.invType; 179 taskItem.InvType = item.invType;
180 part.AddInventoryItem(taskItem); 180 part.AddInventoryItem(taskItem);
181 181
182 // It might seem somewhat crude to update the whole group for a single prim inventory change, 182 // 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
250 MainLog.Instance.Error( 250 MainLog.Instance.Error(
251 "PRIMINVENTORY", 251 "PRIMINVENTORY",
252 "Couldn't find prim ID {0} to update item {1}, {2}", 252 "Couldn't find prim ID {0} to update item {1}, {2}",
253 item.ParentPartID, item.name, item.item_id); 253 item.ParentPartID, item.Name, item.ItemID);
254 } 254 }
255 255
256 return false; 256 return false;