diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2010-02-01 18:44:36 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2010-02-01 18:44:36 -0500 |
| commit | 75b382a97c66b5a35fbb783d42abe303356e104f (patch) | |
| tree | 3b0fcad81ff27bfd5566407111bc39b8f4974a90 /indra/newview | |
| parent | 3989d67f4e28174dc457cac340417fe5e1a3c12f (diff) | |
| parent | e76dd651d4be87c9afb37b2d5d7c9931209fd712 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 9240833632..b0952dd698 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -870,8 +870,7 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f //////////////////////////////////////////////////////////////////////////////// // Don't highlight if it's in certain "quiet" folders which don't need UI // notification (e.g. trash, cof, lost-and-found). - const BOOL user_is_away = gAwayTimer.getStarted(); - if(!user_is_away) + if(!gAgent.getAFK()) { const LLViewerInventoryCategory *parent = gInventory.getFirstNondefaultParent(item_id); if (parent) |