diff options
author | Oren Hurvitz | 2014-05-05 11:06:49 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-05-06 07:28:44 +0100 |
commit | 1e5cff32fc41356971d6ad601cbee7ad62472c76 (patch) | |
tree | be61c0ae3f814ec2a54d1b0ef63d42f86fce2600 /OpenSim/Region/ClientStack/Linden | |
parent | Log whenever an inventory operation is blocked because the item/folder isn't ... (diff) | |
download | opensim-SC_OLD-1e5cff32fc41356971d6ad601cbee7ad62472c76.zip opensim-SC_OLD-1e5cff32fc41356971d6ad601cbee7ad62472c76.tar.gz opensim-SC_OLD-1e5cff32fc41356971d6ad601cbee7ad62472c76.tar.bz2 opensim-SC_OLD-1e5cff32fc41356971d6ad601cbee7ad62472c76.tar.xz |
Show more meaningful error messages when failed to give an item to another user
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 79bc5ef..0eb15f8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -865,18 +865,26 @@ namespace OpenSim.Region.ClientStack.Linden | |||
865 | item = m_Scene.InventoryService.GetItem(new InventoryItemBase(itemID)); | 865 | item = m_Scene.InventoryService.GetItem(new InventoryItemBase(itemID)); |
866 | if (item != null) | 866 | if (item != null) |
867 | { | 867 | { |
868 | copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, item.Owner, itemID, folderID); | 868 | string message; |
869 | if (copyItem != null && client != null) | 869 | copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, item.Owner, itemID, folderID, out message); |
870 | if (client != null) | ||
870 | { | 871 | { |
871 | m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder); | 872 | if (copyItem != null) |
872 | client.SendBulkUpdateInventory(copyItem); | 873 | { |
874 | m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder); | ||
875 | client.SendBulkUpdateInventory(copyItem); | ||
876 | } | ||
877 | else | ||
878 | { | ||
879 | client.SendAgentAlertMessage(message, false); | ||
880 | } | ||
873 | } | 881 | } |
874 | } | 882 | } |
875 | else | 883 | else |
876 | { | 884 | { |
877 | m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard - Failed to retrieve item {0} from notecard {1}", itemID, notecardID); | 885 | m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard - Failed to retrieve item {0} from notecard {1}", itemID, notecardID); |
878 | if (client != null) | 886 | if (client != null) |
879 | client.SendAlertMessage("Failed to retrieve item"); | 887 | client.SendAgentAlertMessage("Failed to retrieve item", false); |
880 | } | 888 | } |
881 | } | 889 | } |
882 | catch (Exception e) | 890 | catch (Exception e) |