aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-25 17:15:21 +0000
committerJustin Clarke Casey2008-11-25 17:15:21 +0000
commit759a6672470c6f942ba6ef4f43eb41209e9dea5c (patch)
tree7c30adc46c338957634cc9db41fd8631063251b1 /OpenSim/Region/Environment/Scenes
parent* Remove direct access to Inventory.Serial (diff)
downloadopensim-SC_OLD-759a6672470c6f942ba6ef4f43eb41209e9dea5c.zip
opensim-SC_OLD-759a6672470c6f942ba6ef4f43eb41209e9dea5c.tar.gz
opensim-SC_OLD-759a6672470c6f942ba6ef4f43eb41209e9dea5c.tar.bz2
opensim-SC_OLD-759a6672470c6f942ba6ef4f43eb41209e9dea5c.tar.xz
* Make a step on removing direct access to TaskInventoryDictionary from other packages
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs4
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 26a38a3..e97b99f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -364,8 +364,8 @@ namespace OpenSim.Region.Environment.Scenes
364 /// </value> 364 /// </value>
365 public TaskInventoryDictionary TaskInventory 365 public TaskInventoryDictionary TaskInventory
366 { 366 {
367 get { return Inventory.Items; } 367 get { return m_inventory.Items; }
368 set { Inventory.Items = value; } 368 set { m_inventory.Items = value; }
369 } 369 }
370 370
371 public uint ObjectFlags 371 public uint ObjectFlags
@@ -1263,7 +1263,7 @@ if (m_shape != null) {
1263 dupe._category = _category; 1263 dupe._category = _category;
1264 dupe.m_rezzed = m_rezzed; 1264 dupe.m_rezzed = m_rezzed;
1265 1265
1266 dupe.Inventory.Items = (TaskInventoryDictionary)dupe.Inventory.Items.Clone(); 1266 dupe.m_inventory.Items = (TaskInventoryDictionary)dupe.m_inventory.Items.Clone();
1267 1267
1268 if (userExposed) 1268 if (userExposed)
1269 dupe.ResetIDs(linkNum); 1269 dupe.ResetIDs(linkNum);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
index 82a89df..ae43c5e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment.Scenes
69 /// <value> 69 /// <value>
70 /// Inventory serial number 70 /// Inventory serial number
71 /// </value> 71 /// </value>
72 public uint Serial 72 protected internal uint Serial
73 { 73 {
74 get { return m_inventorySerial; } 74 get { return m_inventorySerial; }
75 set { m_inventorySerial = value; } 75 set { m_inventorySerial = value; }
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.Scenes
78 /// <value> 78 /// <value>
79 /// Raw inventory data 79 /// Raw inventory data
80 /// </value> 80 /// </value>
81 public TaskInventoryDictionary Items 81 protected internal TaskInventoryDictionary Items
82 { 82 {
83 get { return m_items; } 83 get { return m_items; }
84 set { m_items = value; } 84 set { m_items = value; }