aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-06 01:56:29 +0000
committerJustin Clarke Casey2008-01-06 01:56:29 +0000
commit679923ec871d98e5aa514734b2e23f9a00c58433 (patch)
treec2591d0a336339dd7ce5ca26d39abde68d0b81be /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentPrim inventory phase 4. Properly recover the prim folder ID from storage. S... (diff)
downloadopensim-SC-679923ec871d98e5aa514734b2e23f9a00c58433.zip
opensim-SC-679923ec871d98e5aa514734b2e23f9a00c58433.tar.gz
opensim-SC-679923ec871d98e5aa514734b2e23f9a00c58433.tar.bz2
opensim-SC-679923ec871d98e5aa514734b2e23f9a00c58433.tar.xz
Factor out TaskInventoryItem
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 4bbc2ed..a9b3fe9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1178,15 +1178,15 @@ namespace OpenSim.Region.Environment.Scenes
1178 SceneObjectPart part = GetChildPart(localID); 1178 SceneObjectPart part = GetChildPart(localID);
1179 if (part != null) 1179 if (part != null)
1180 { 1180 {
1181 SceneObjectPart.TaskInventoryItem taskItem = new SceneObjectPart.TaskInventoryItem(); 1181 TaskInventoryItem taskItem = new TaskInventoryItem();
1182 taskItem.item_id = item.inventoryID; 1182 taskItem.item_id = item.inventoryID;
1183 taskItem.asset_id = item.assetID; 1183 taskItem.asset_id = item.assetID;
1184 taskItem.name = item.inventoryName; 1184 taskItem.name = item.inventoryName;
1185 taskItem.desc = item.inventoryDescription; 1185 taskItem.desc = item.inventoryDescription;
1186 taskItem.owner_id = item.avatarID; 1186 taskItem.owner_id = item.avatarID;
1187 taskItem.creator_id = item.creatorsID; 1187 taskItem.creator_id = item.creatorsID;
1188 taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType]; 1188 taskItem.type = TaskInventoryItem.Types[item.assetType];
1189 taskItem.inv_type = SceneObjectPart.TaskInventoryItem.Types[item.invType]; 1189 taskItem.inv_type = TaskInventoryItem.Types[item.invType];
1190 part.AddInventoryItem(taskItem); 1190 part.AddInventoryItem(taskItem);
1191 return true; 1191 return true;
1192 } 1192 }
@@ -1200,15 +1200,15 @@ namespace OpenSim.Region.Environment.Scenes
1200 SceneObjectPart part = GetChildPart(localID); 1200 SceneObjectPart part = GetChildPart(localID);
1201 if (part != null) 1201 if (part != null)
1202 { 1202 {
1203 SceneObjectPart.TaskInventoryItem taskItem = new SceneObjectPart.TaskInventoryItem(); 1203 TaskInventoryItem taskItem = new TaskInventoryItem();
1204 taskItem.item_id = copyItemID; 1204 taskItem.item_id = copyItemID;
1205 taskItem.asset_id = item.assetID; 1205 taskItem.asset_id = item.assetID;
1206 taskItem.name = item.inventoryName; 1206 taskItem.name = item.inventoryName;
1207 taskItem.desc = item.inventoryDescription; 1207 taskItem.desc = item.inventoryDescription;
1208 taskItem.owner_id = new LLUUID(item.avatarID.ToString()); 1208 taskItem.owner_id = new LLUUID(item.avatarID.ToString());
1209 taskItem.creator_id = new LLUUID(item.creatorsID.ToString()); 1209 taskItem.creator_id = new LLUUID(item.creatorsID.ToString());
1210 taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType]; 1210 taskItem.type = TaskInventoryItem.Types[item.assetType];
1211 taskItem.inv_type = SceneObjectPart.TaskInventoryItem.InvTypes[item.invType]; 1211 taskItem.inv_type = TaskInventoryItem.InvTypes[item.invType];
1212 part.AddInventoryItem(taskItem); 1212 part.AddInventoryItem(taskItem);
1213 return true; 1213 return true;
1214 } 1214 }