aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-02 22:05:10 +0000
committerJustin Clarke Casey2008-01-02 22:05:10 +0000
commit78ba9cebc57d44c510c02a4a94043ad0fa9c7a0f (patch)
treed539bb7636ca6eaba7adda3d014465f834c03fa2 /OpenSim
parent* Added the ability for Region Owners to add and remove estate managers using... (diff)
downloadopensim-SC_OLD-78ba9cebc57d44c510c02a4a94043ad0fa9c7a0f.zip
opensim-SC_OLD-78ba9cebc57d44c510c02a4a94043ad0fa9c7a0f.tar.gz
opensim-SC_OLD-78ba9cebc57d44c510c02a4a94043ad0fa9c7a0f.tar.bz2
opensim-SC_OLD-78ba9cebc57d44c510c02a4a94043ad0fa9c7a0f.tar.xz
Minor refactoring to expose PrimInventory from SceneObjectPart
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs22
1 files changed, 15 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index e211b66..1119c99 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -60,7 +60,15 @@ namespace OpenSim.Region.Environment.Scenes
60 60
61 [XmlIgnore] public PhysicsActor PhysActor = null; 61 [XmlIgnore] public PhysicsActor PhysActor = null;
62 62
63 protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); 63 // Holds in memory prim inventory
64 protected Dictionary<LLUUID, TaskInventoryItem> m_taskInventory
65 = new Dictionary<LLUUID, TaskInventoryItem>();
66
67 public Dictionary<LLUUID, TaskInventoryItem> TaskInventory
68 {
69 get { return m_taskInventory; }
70 }
71
64 public LLUUID LastOwnerID; 72 public LLUUID LastOwnerID;
65 public LLUUID OwnerID; 73 public LLUUID OwnerID;
66 public LLUUID GroupID; 74 public LLUUID GroupID;
@@ -76,7 +84,7 @@ namespace OpenSim.Region.Environment.Scenes
76 private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1); 84 private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1);
77 private LLUUID m_SitTargetAvatar = LLUUID.Zero; 85 private LLUUID m_SitTargetAvatar = LLUUID.Zero;
78 86
79 87 //
80 // Main grid has default permissions as follows 88 // Main grid has default permissions as follows
81 // 89 //
82 public uint OwnerMask = FULL_MASK_PERMISSIONS_OWNER; 90 public uint OwnerMask = FULL_MASK_PERMISSIONS_OWNER;
@@ -1048,7 +1056,7 @@ namespace OpenSim.Region.Environment.Scenes
1048 item.parent_id = m_folderID; 1056 item.parent_id = m_folderID;
1049 item.creation_date = 1000; 1057 item.creation_date = 1000;
1050 item.ParentPartID = UUID; 1058 item.ParentPartID = UUID;
1051 TaskInventory.Add(item.item_id, item); 1059 m_taskInventory.Add(item.item_id, item);
1052 m_inventorySerial++; 1060 m_inventorySerial++;
1053 } 1061 }
1054 1062
@@ -1056,10 +1064,10 @@ namespace OpenSim.Region.Environment.Scenes
1056 { 1064 {
1057 if (localID == LocalID) 1065 if (localID == LocalID)
1058 { 1066 {
1059 if (TaskInventory.ContainsKey(itemID)) 1067 if (m_taskInventory.ContainsKey(itemID))
1060 { 1068 {
1061 string type = TaskInventory[itemID].inv_type; 1069 string type = m_taskInventory[itemID].inv_type;
1062 TaskInventory.Remove(itemID); 1070 m_taskInventory.Remove(itemID);
1063 m_inventorySerial++; 1071 m_inventorySerial++;
1064 if (type == "lsltext") 1072 if (type == "lsltext")
1065 { 1073 {
@@ -1098,7 +1106,7 @@ namespace OpenSim.Region.Environment.Scenes
1098 { 1106 {
1099 byte[] fileData = new byte[0]; 1107 byte[] fileData = new byte[0];
1100 InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, UUID); 1108 InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, UUID);
1101 foreach (TaskInventoryItem item in TaskInventory.Values) 1109 foreach (TaskInventoryItem item in m_taskInventory.Values)
1102 { 1110 {
1103 invString.AddItemStart(); 1111 invString.AddItemStart();
1104 invString.AddNameValueLine("item_id", item.item_id.ToString()); 1112 invString.AddNameValueLine("item_id", item.item_id.ToString());