summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew Polunin <apolunin@productengine.com>2009-11-10 09:32:39 +0200
committerAndrew Polunin <apolunin@productengine.com>2009-11-10 09:32:39 +0200
commit9dacb6b79e8c7568e7a9aaa9cb12090383241a47 (patch)
tree886796d70d4cd6ba5aa846e8a3c416f00e04ef7b /indra
parentff8fc7309a88b970eae2b4621724a2b24e9413fe (diff)
fixed normal bug EXT-1649 Groups you chatted in recently show up in the Recent People tab
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llrecentpeople.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/indra/newview/llrecentpeople.cpp b/indra/newview/llrecentpeople.cpp
index b491c7e109..bd46b5b56a 100644
--- a/indra/newview/llrecentpeople.cpp
+++ b/indra/newview/llrecentpeople.cpp
@@ -33,6 +33,7 @@
#include "llviewerprecompiledheaders.h"
#include "llrecentpeople.h"
+#include "llgroupmgr.h"
#include "llagent.h"
@@ -43,12 +44,18 @@ bool LLRecentPeople::add(const LLUUID& id)
if (id == gAgent.getID())
return false;
- LLDate date_added = LLDate::now();
+ bool is_not_group_id = LLGroupMgr::getInstance()->getGroupData(id) == NULL;
- //[] instead of insert to replace existing id->date with new date value
- mPeople[id] = date_added;
- mChangedSignal();
- return true;
+ if (is_not_group_id)
+ {
+ LLDate date_added = LLDate::now();
+
+ //[] instead of insert to replace existing id->date with new date value
+ mPeople[id] = date_added;
+ mChangedSignal();
+ }
+
+ return is_not_group_id;
}
bool LLRecentPeople::contains(const LLUUID& id) const