ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Make a step on removing direct access to TaskInventoryDictionary from other packages

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-11-25 17:15:21 +00:00
parent 11f7471d9c
commit 759a667247
4 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/Environment/Interfaces/IEntityInventory.cs
View File

@@ -44,36 +44,21 @@ namespace OpenSim.Region.Environment.Scenes
///
/// This is not a finished 1.0 candidate interface
public interface IEntityInventory
{
/// <value>
/// Inventory serial number
/// </value>
// uint Serial
// {
// get;
// set;
// }
/// <value>
/// Raw inventory data
/// </value>
TaskInventoryDictionary Items
{
get;
set;
}
{
/// <summary>
/// Force the task inventory of this prim to persist at the next update sweep
/// </summary>
void ForceInventoryPersistence();
/// <summary>
/// Reset UUIDs for all the items in the prim's inventory. This involves either generating
/// Reset UUIDs for all the items in the prim's inventory.
/// </summary>
///
/// This involves either generating
/// new ones or setting existing UUIDs to the correct parent UUIDs.
///
/// If this method is called and there are inventory items, then we regard the inventory as having changed.
/// </summary>
///
/// <param name="linkNum">Link number for the part</param>
void ResetInventoryIDs();

6
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@@ -364,8 +364,8 @@ namespace OpenSim.Region.Environment.Scenes
/// </value>
public TaskInventoryDictionary TaskInventory
{
get { return Inventory.Items; }
set { Inventory.Items = value; }
get { return m_inventory.Items; }
set { m_inventory.Items = value; }
}
public uint ObjectFlags
@@ -1263,7 +1263,7 @@ if (m_shape != null) {
dupe._category = _category;
dupe.m_rezzed = m_rezzed;
dupe.Inventory.Items = (TaskInventoryDictionary)dupe.Inventory.Items.Clone();
dupe.m_inventory.Items = (TaskInventoryDictionary)dupe.m_inventory.Items.Clone();
if (userExposed)
dupe.ResetIDs(linkNum);

4
OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
View File

@@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <value>
/// Inventory serial number
/// </value>
public uint Serial
protected internal uint Serial
{
get { return m_inventorySerial; }
set { m_inventorySerial = value; }
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <value>
/// Raw inventory data
/// </value>
public TaskInventoryDictionary Items
protected internal TaskInventoryDictionary Items
{
get { return m_items; }
set { m_items = value; }