aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-07 12:39:06 +0000
committerJustin Clarke Casey2008-03-07 12:39:06 +0000
commit9aeff3fb86b8909573eaaaf2921b5a0a8f803e5c (patch)
tree0f048d006d74aa5160d448c331e0cb5a656bfb47 /OpenSim
parentMake Local back end services warn/error messages explicitly say they are from... (diff)
downloadopensim-SC_OLD-9aeff3fb86b8909573eaaaf2921b5a0a8f803e5c.zip
opensim-SC_OLD-9aeff3fb86b8909573eaaaf2921b5a0a8f803e5c.tar.gz
opensim-SC_OLD-9aeff3fb86b8909573eaaaf2921b5a0a8f803e5c.tar.bz2
opensim-SC_OLD-9aeff3fb86b8909573eaaaf2921b5a0a8f803e5c.tar.xz
* Temporary resolution for mantis #711
* Trying to store items other than textures, sounds and scripts in a prim's inventory should no longer cause an exception. * Temporary solution is to ignore storage requests for these assets - actually implementing this requires changes to TaskInventoryItem, at least
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs29
1 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 14a6f7b..5683a7a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -606,7 +606,6 @@ namespace OpenSim.Region.Environment.Scenes
606 public void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, 606 public void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID,
607 uint primLocalID) 607 uint primLocalID)
608 { 608 {
609
610 SceneObjectGroup group = GetGroupByPrim(primLocalID); 609 SceneObjectGroup group = GetGroupByPrim(primLocalID);
611 610
612 if (group != null) 611 if (group != null)
@@ -629,11 +628,25 @@ namespace OpenSim.Region.Environment.Scenes
629 628
630 if (item != null) 629 if (item != null)
631 { 630 {
632 631 if (item.assetType == 0 || item.assetType == 1 || item.assetType == 10)
633 group.AddInventoryItem(remoteClient, primLocalID, item, copyID); 632 {
634 m_log.InfoFormat("[PRIMINVENTORY]: Update with item {0} requested of prim {1} for {2}", item.inventoryName, primLocalID, remoteClient.Name); 633 group.AddInventoryItem(remoteClient, primLocalID, item, copyID);
635 group.GetProperties(remoteClient); 634 m_log.InfoFormat(
636 635 "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
636 item.inventoryName, primLocalID, remoteClient.Name);
637 group.GetProperties(remoteClient);
638 }
639 else
640 {
641 // XXX Nasty temporary way of stopping things other than sounds, textures and scripts
642 // from going in a prim's inventory, since other things will not currently work
643 // See http://opensimulator.org/mantis/view.php?id=711 for the error caused later on
644 // - to implement requires changes to TaskInventoryItem (which really requires the current
645 // nasty way it is done to be changed).
646 m_log.WarnFormat(
647 "[PRIM INVENTORY]: Sorry, prim inventory storage of asset type {0} is not yet supported",
648 item.assetType);
649 }
637 } 650 }
638 else 651 else
639 { 652 {
@@ -641,12 +654,8 @@ namespace OpenSim.Region.Environment.Scenes
641 "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!", 654 "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!",
642 itemID, remoteClient.Name); 655 itemID, remoteClient.Name);
643 } 656 }
644
645 } 657 }
646
647 } 658 }
648
649
650 } 659 }
651 else 660 else
652 { 661 {