aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs12
2 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 1001fce..ca17937 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -542,7 +542,7 @@ namespace OpenSim.Region.Environment.Scenes
542 } 542 }
543 543
544 /// <summary> 544 /// <summary>
545 /// Request a prim (task) inventory 545 /// Send the details of a prim's inventory to the client.
546 /// </summary> 546 /// </summary>
547 /// <param name="remoteClient"></param> 547 /// <param name="remoteClient"></param>
548 /// <param name="primLocalID"></param> 548 /// <param name="primLocalID"></param>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 56894b7..a73bb76 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -286,12 +286,16 @@ namespace OpenSim.Region.Environment.Scenes
286 { 286 {
287 if (m_taskInventory.ContainsKey(itemID)) 287 if (m_taskInventory.ContainsKey(itemID))
288 { 288 {
289// m_log.DebugFormat(
290// "[PRIM INVENTORY]: Retrieved task inventory item {0}, {1} from prim {2}, {3}",
291// m_taskInventory[itemID].Name, itemID, Name, UUID);
292
289 return m_taskInventory[itemID]; 293 return m_taskInventory[itemID];
290 } 294 }
291 else 295 else
292 { 296 {
293 m_log.ErrorFormat( 297 m_log.ErrorFormat(
294 "[PRIMINVENTORY]: " + 298 "[PRIM INVENTORY]: " +
295 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 299 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
296 itemID, Name, UUID); 300 itemID, Name, UUID);
297 } 301 }
@@ -390,7 +394,7 @@ namespace OpenSim.Region.Environment.Scenes
390 } 394 }
391 395
392 /// <summary> 396 /// <summary>
393 /// 397 /// Return the name with which a client can request a xfer of this prim's inventory metadata
394 /// </summary> 398 /// </summary>
395 /// <param name="client"></param> 399 /// <param name="client"></param>
396 /// <param name="localID"></param> 400 /// <param name="localID"></param>
@@ -409,6 +413,10 @@ namespace OpenSim.Region.Environment.Scenes
409 } 413 }
410 } 414 }
411 415
416 /// <summary>
417 /// Serialize all the metadata for the items in this prim's inventory ready for sending to the client
418 /// </summary>
419 /// <param name="xferManager"></param>
412 public void RequestInventoryFile(IXfer xferManager) 420 public void RequestInventoryFile(IXfer xferManager)
413 { 421 {
414 byte[] fileData = new byte[0]; 422 byte[] fileData = new byte[0];