diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-08-05 19:30:12 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-08-05 19:30:12 +0300 |
| commit | 24f88cfe194484a6cf27e27bd60d3ad198abba32 (patch) | |
| tree | 39afebee31ed95105cbeff62a1313af66f63491c /indra/newview | |
| parent | 812ad1b67924f8ab92400dacfeebaff93526d506 (diff) | |
| parent | 55483e651fbabdecd77e739edebad66d486f382a (diff) | |
Merging STORM-565
Diffstat (limited to 'indra/newview')
| -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); |