diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-01 16:30:39 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-01 16:30:39 -0800 |
| commit | aeaaf90fd7e36432428df9a6bcda6eb51a5cf0b1 (patch) | |
| tree | 788628f41e45d657b67c73d6e1a5f89f924d7b0e /indra/newview/llviewermessage.cpp | |
| parent | 9430b8de6585e0c0aa980fc87cf73fdbc8a8c5d2 (diff) | |
| parent | 83eda0d847e6472b52167d135191b9ad7591a97f (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -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) |