aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-31 01:52:06 +0100
committerJustin Clark-Casey (justincc)2012-03-31 01:52:06 +0100
commit32a953fed727fdadd65228b7c9282091da3521ac (patch)
tree014a128df31336fddcb9be1243f3f255f7d30b6f /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
parentRename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con... (diff)
downloadopensim-SC_OLD-32a953fed727fdadd65228b7c9282091da3521ac.zip
opensim-SC_OLD-32a953fed727fdadd65228b7c9282091da3521ac.tar.gz
opensim-SC_OLD-32a953fed727fdadd65228b7c9282091da3521ac.tar.bz2
opensim-SC_OLD-32a953fed727fdadd65228b7c9282091da3521ac.tar.xz
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index a73d9b6..10012d0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.Framework.Scenes
96 96
97 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID; 97 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
98 98
99 SceneObjectPart part = GetChildPart(localID); 99 SceneObjectPart part = GetPart(localID);
100 if (part != null) 100 if (part != null)
101 { 101 {
102 TaskInventoryItem taskItem = new TaskInventoryItem(); 102 TaskInventoryItem taskItem = new TaskInventoryItem();
@@ -170,7 +170,7 @@ namespace OpenSim.Region.Framework.Scenes
170 /// <returns>null if the item does not exist</returns> 170 /// <returns>null if the item does not exist</returns>
171 public TaskInventoryItem GetInventoryItem(uint primID, UUID itemID) 171 public TaskInventoryItem GetInventoryItem(uint primID, UUID itemID)
172 { 172 {
173 SceneObjectPart part = GetChildPart(primID); 173 SceneObjectPart part = GetPart(primID);
174 if (part != null) 174 if (part != null)
175 { 175 {
176 return part.Inventory.GetInventoryItem(itemID); 176 return part.Inventory.GetInventoryItem(itemID);
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes
194 /// <returns>false if the item did not exist, true if the update occurred succesfully</returns> 194 /// <returns>false if the item did not exist, true if the update occurred succesfully</returns>
195 public bool UpdateInventoryItem(TaskInventoryItem item) 195 public bool UpdateInventoryItem(TaskInventoryItem item)
196 { 196 {
197 SceneObjectPart part = GetChildPart(item.ParentPartID); 197 SceneObjectPart part = GetPart(item.ParentPartID);
198 if (part != null) 198 if (part != null)
199 { 199 {
200 part.Inventory.UpdateInventoryItem(item); 200 part.Inventory.UpdateInventoryItem(item);
@@ -214,7 +214,7 @@ namespace OpenSim.Region.Framework.Scenes
214 214
215 public int RemoveInventoryItem(uint localID, UUID itemID) 215 public int RemoveInventoryItem(uint localID, UUID itemID)
216 { 216 {
217 SceneObjectPart part = GetChildPart(localID); 217 SceneObjectPart part = GetPart(localID);
218 if (part != null) 218 if (part != null)
219 { 219 {
220 int type = part.Inventory.RemoveInventoryItem(itemID); 220 int type = part.Inventory.RemoveInventoryItem(itemID);