aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs10
-rw-r--r--OpenSim/Region/Environment/Interfaces/IEntityInventory.cs27
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs4
4 files changed, 16 insertions, 31 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 0a10cea..532d54e 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -256,7 +256,7 @@ namespace OpenSim.Data.Tests
256 sop.RotationOffset = rotoff; 256 sop.RotationOffset = rotoff;
257 sop.CreatorID = creator; 257 sop.CreatorID = creator;
258 sop.InventorySerial = iserial; 258 sop.InventorySerial = iserial;
259 sop.Inventory.Items = dic; 259 sop.TaskInventory = dic;
260 sop.ObjectFlags = objf; 260 sop.ObjectFlags = objf;
261 sop.Name = name; 261 sop.Name = name;
262 sop.Material = material; 262 sop.Material = material;
@@ -288,7 +288,7 @@ namespace OpenSim.Data.Tests
288 Assert.That(uuid,Is.EqualTo(sop.UUID)); 288 Assert.That(uuid,Is.EqualTo(sop.UUID));
289 Assert.That(creator,Is.EqualTo(sop.CreatorID)); 289 Assert.That(creator,Is.EqualTo(sop.CreatorID));
290 Assert.That(iserial,Is.EqualTo(sop.InventorySerial)); 290 Assert.That(iserial,Is.EqualTo(sop.InventorySerial));
291 Assert.That(dic,Is.EqualTo(sop.Inventory.Items)); 291 Assert.That(dic,Is.EqualTo(sop.TaskInventory));
292 Assert.That(objf,Is.EqualTo(sop.ObjectFlags)); 292 Assert.That(objf,Is.EqualTo(sop.ObjectFlags));
293 Assert.That(name,Is.EqualTo(sop.Name)); 293 Assert.That(name,Is.EqualTo(sop.Name));
294 Assert.That(material,Is.EqualTo(sop.Material)); 294 Assert.That(material,Is.EqualTo(sop.Material));
@@ -337,7 +337,7 @@ namespace OpenSim.Data.Tests
337 Assert.That(uuid,Is.EqualTo(p.UUID)); 337 Assert.That(uuid,Is.EqualTo(p.UUID));
338 Assert.That(creator,Is.EqualTo(p.CreatorID)); 338 Assert.That(creator,Is.EqualTo(p.CreatorID));
339 //Assert.That(iserial,Is.EqualTo(p.InventorySerial)); 339 //Assert.That(iserial,Is.EqualTo(p.InventorySerial));
340 Assert.That(dic,Is.EqualTo(p.Inventory.Items)); 340 Assert.That(dic,Is.EqualTo(p.TaskInventory));
341 //Assert.That(objf,Is.EqualTo(p.ObjectFlags)); 341 //Assert.That(objf,Is.EqualTo(p.ObjectFlags));
342 Assert.That(name,Is.EqualTo(p.Name)); 342 Assert.That(name,Is.EqualTo(p.Name));
343 Assert.That(material,Is.EqualTo(p.Material)); 343 Assert.That(material,Is.EqualTo(p.Material));
@@ -415,7 +415,7 @@ namespace OpenSim.Data.Tests
415 sog2.RootPart.GroupPosition = groupos; 415 sog2.RootPart.GroupPosition = groupos;
416 sog2.RootPart.RotationOffset = rotoff; 416 sog2.RootPart.RotationOffset = rotoff;
417 sog2.RootPart.CreatorID = creator; 417 sog2.RootPart.CreatorID = creator;
418 sog2.RootPart.Inventory.Items = dic; 418 sog2.RootPart.TaskInventory = dic;
419 sog2.RootPart.Name = name; 419 sog2.RootPart.Name = name;
420 sog2.RootPart.Material = material; 420 sog2.RootPart.Material = material;
421 sog2.RootPart.ScriptAccessPin = pin; 421 sog2.RootPart.ScriptAccessPin = pin;
@@ -449,7 +449,7 @@ namespace OpenSim.Data.Tests
449 Assert.That(name,Is.EqualTo(p.Name)); 449 Assert.That(name,Is.EqualTo(p.Name));
450 Assert.That(rotoff,Is.EqualTo(p.RotationOffset)); 450 Assert.That(rotoff,Is.EqualTo(p.RotationOffset));
451 Assert.That(creator,Is.EqualTo(p.CreatorID)); 451 Assert.That(creator,Is.EqualTo(p.CreatorID));
452 Assert.That(dic,Is.EqualTo(p.Inventory.Items)); 452 Assert.That(dic,Is.EqualTo(p.TaskInventory));
453 Assert.That(name,Is.EqualTo(p.Name)); 453 Assert.That(name,Is.EqualTo(p.Name));
454 Assert.That(material,Is.EqualTo(p.Material)); 454 Assert.That(material,Is.EqualTo(p.Material));
455 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin)); 455 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin));
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; }