From 759a6672470c6f942ba6ef4f43eb41209e9dea5c Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 25 Nov 2008 17:15:21 +0000
Subject: * Make a step on removing direct access to TaskInventoryDictionary
from other packages
---
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 6 +++---
OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes')
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
///
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);
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
///
/// Inventory serial number
///
- public uint Serial
+ protected internal uint Serial
{
get { return m_inventorySerial; }
set { m_inventorySerial = value; }
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.Scenes
///
/// Raw inventory data
///
- public TaskInventoryDictionary Items
+ protected internal TaskInventoryDictionary Items
{
get { return m_items; }
set { m_items = value; }
--
cgit v1.1