diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:50:59 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:50:59 +0000 |
| commit | 7df79382a075646a51f21bed0d7f8de883fc3608 (patch) | |
| tree | e7a71ed0dc7e05e4091066e3a0455343dfcfce4f /indra/newview/llrecentpeople.cpp | |
| parent | 56449313529145a3d3c0e231967d9502b549056c (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
* Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868
* New Development: EXT-748 EXT-863 EXT-835
QA: Please test Recent List to verify it has no troubles.
Diffstat (limited to 'indra/newview/llrecentpeople.cpp')
| -rw-r--r-- | indra/newview/llrecentpeople.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llrecentpeople.cpp b/indra/newview/llrecentpeople.cpp index 0c16cea004..04abe36878 100644 --- a/indra/newview/llrecentpeople.cpp +++ b/indra/newview/llrecentpeople.cpp @@ -43,7 +43,8 @@ bool LLRecentPeople::add(const LLUUID& id) if (contains(id) || id == gAgent.getID()) return false; - mList.insert(id); + LLDate date_added = LLDate::now(); + mList.insert(std::make_pair(id, date_added)); mChangedSignal(); return true; } @@ -56,8 +57,8 @@ bool LLRecentPeople::contains(const LLUUID& id) const void LLRecentPeople::get(std::vector<LLUUID>& result) const { result.clear(); - for (std::set<LLUUID>::const_iterator pos = mList.begin(); pos != mList.end(); ++pos) - result.push_back(*pos); + for (recent_people_t::const_iterator pos = mList.begin(); pos != mList.end(); ++pos) + result.push_back((*pos).first); } // virtual |