summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-07-25 18:18:53 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-07-25 18:18:53 +0300
commit9c6eb9ae4088b355d01ada204879b973aa160b7c (patch)
treedf66bac21157d47fb821f7602b41f8eebdff8278 /indra/newview/llviewermessage.cpp
parentf0ab36aec55550ed86d969ccdbad45c5a8db277c (diff)
MAINT-4146 - [Griefing] Folders from muted avatars not sent to trash at login
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5495c0e06a..3925154c0f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1639,7 +1639,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
LLDiscardAgentOffer* discard_agent_offer = new LLDiscardAgentOffer(mFolderID, mObjectID);
discard_agent_offer->startFetch();
- if (catp || (itemp && itemp->isFinished()))
+ if ((catp && gInventory.isCategoryComplete(mObjectID)) || (itemp && itemp->isFinished()))
{
discard_agent_offer->done();
}