aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons/Groups/GroupsModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-06 17:22:47 +0100
committerJustin Clark-Casey (justincc)2014-05-06 17:22:47 +0100
commit95eeb4dde840a8b0d325dd0423dc7099aaed7dfa (patch)
tree139e7fd30e49d13cdb5c53ebcf82eb5cc22cc8e9 /OpenSim/Addons/Groups/GroupsModule.cs
parentminor: Comment out Cacheitems debug log lines for now (diff)
parentBetter error handling in AssetServerPostHandler. Invalid XML causes an Invali... (diff)
downloadopensim-SC-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.zip
opensim-SC-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.gz
opensim-SC-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.bz2
opensim-SC-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Addons/Groups/GroupsModule.cs')
-rw-r--r--OpenSim/Addons/Groups/GroupsModule.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index f11606a..2831326 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -496,12 +496,13 @@ namespace OpenSim.Groups
496 Util.ParseUniversalUserIdentifier(notice.noticeData.AttachmentOwnerID, out giver, out tmp, out tmp, out tmp, out tmp); 496 Util.ParseUniversalUserIdentifier(notice.noticeData.AttachmentOwnerID, out giver, out tmp, out tmp, out tmp, out tmp);
497 497
498 m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId); 498 m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId);
499 string message;
499 InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId, 500 InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId,
500 giver, notice.noticeData.AttachmentItemID); 501 giver, notice.noticeData.AttachmentItemID, out message);
501 502
502 if (itemCopy == null) 503 if (itemCopy == null)
503 { 504 {
504 remoteClient.SendAgentAlertMessage("Can't find item to give. Nothing given.", false); 505 remoteClient.SendAgentAlertMessage(message, false);
505 return; 506 return;
506 } 507 }
507 508