diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-22 17:18:34 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-22 17:18:34 -0400 |
| commit | 015cf59c96a4613996fc34b898fe9751f27f9c8c (patch) | |
| tree | 412a776e4bb8ae72960ea02d40ea7c98be1c1065 /indra/newview/llviewermessage.cpp | |
| parent | f99cf295e1d7e297996d4ea32a2202273010d8a3 (diff) | |
| parent | b73291e9bd6a706c5c8913f1c40bd8324f772c4a (diff) | |
merged .hgtags
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); |