diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
commit | 3d2378f1020060a84ab0b9ae23507077b7a0e7c1 (patch) | |
tree | 448bc57cf16514ef602602feff45ec4583d18608 /indra/newview/llviewermessage.cpp | |
parent | f094d4f7529c27233f5ca228bda21deb9b864f1a (diff) | |
parent | ebb55355ebbe6ec6760d8683e461903957ed24e5 (diff) |
merge from viewer-pre-release
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e934c38c22..321d02aaf1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1852,14 +1852,6 @@ void LLOfferInfo::initRespondFunctionMap() void inventory_offer_handler(LLOfferInfo* info) { - //Until throttling is implmented, busy mode should reject inventory instead of silently - //accepting it. SEE SL-39554 - if (gAgent.getBusy()) - { - info->forceResponse(IOR_BUSY); - return; - } - //If muted, don't even go through the messaging stuff. Just curtail the offer here. if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName)) { @@ -2671,6 +2663,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // Same as closing window info->forceResponse(IOR_DECLINE); } + else if (is_busy && dialog != IM_TASK_INVENTORY_OFFERED) // busy mode must not affect interaction with objects (STORM-565) + { + // Until throttling is implemented, busy mode should reject inventory instead of silently + // accepting it. SEE SL-39554 + info->forceResponse(IOR_BUSY); + } else { inventory_offer_handler(info); |