diff options
author | Justin Clarke Casey | 2008-11-25 17:15:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-25 17:15:21 +0000 |
commit | 759a6672470c6f942ba6ef4f43eb41209e9dea5c (patch) | |
tree | 7c30adc46c338957634cc9db41fd8631063251b1 /OpenSim/Region/Environment | |
parent | * Remove direct access to Inventory.Serial (diff) | |
download | opensim-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 '')
3 files changed, 11 insertions, 26 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs b/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs index db809a0..a270293 100644 --- a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs | |||
@@ -44,36 +44,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
44 | /// | 44 | /// |
45 | /// This is not a finished 1.0 candidate interface | 45 | /// This is not a finished 1.0 candidate interface |
46 | public interface IEntityInventory | 46 | public interface IEntityInventory |
47 | { | 47 | { |
48 | /// <value> | ||
49 | /// Inventory serial number | ||
50 | /// </value> | ||
51 | // uint Serial | ||
52 | // { | ||
53 | // get; | ||
54 | // set; | ||
55 | // } | ||
56 | |||
57 | /// <value> | ||
58 | /// Raw inventory data | ||
59 | /// </value> | ||
60 | TaskInventoryDictionary Items | ||
61 | { | ||
62 | get; | ||
63 | set; | ||
64 | } | ||
65 | |||
66 | /// <summary> | 48 | /// <summary> |
67 | /// Force the task inventory of this prim to persist at the next update sweep | 49 | /// Force the task inventory of this prim to persist at the next update sweep |
68 | /// </summary> | 50 | /// </summary> |
69 | void ForceInventoryPersistence(); | 51 | void ForceInventoryPersistence(); |
70 | 52 | ||
71 | /// <summary> | 53 | /// <summary> |
72 | /// Reset UUIDs for all the items in the prim's inventory. This involves either generating | 54 | /// Reset UUIDs for all the items in the prim's inventory. |
55 | /// </summary> | ||
56 | /// | ||
57 | /// This involves either generating | ||
73 | /// new ones or setting existing UUIDs to the correct parent UUIDs. | 58 | /// new ones or setting existing UUIDs to the correct parent UUIDs. |
74 | /// | 59 | /// |
75 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. | 60 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. |
76 | /// </summary> | 61 | /// |
77 | /// <param name="linkNum">Link number for the part</param> | 62 | /// <param name="linkNum">Link number for the part</param> |
78 | void ResetInventoryIDs(); | 63 | void ResetInventoryIDs(); |
79 | 64 | ||
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; } |