diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-05 17:56:13 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-05 17:56:13 +0200 |
| commit | 71c0973a1eec0a58fcb143b268ac1069d16a4adb (patch) | |
| tree | cb74a6e5ba50dcbc5e6a94d552f8fcb23d42ab12 /indra/newview | |
| parent | a2fb58b8dbf29d484888a1bdf5f685630e088628 (diff) | |
more work on EXT-1649 Groups you chatted in recently show up in the Recent People tab
previous place for adding recent people was wrong...move this to LLIMSession.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llspeakers.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 8664f4ab4a..daabf1f717 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -382,6 +382,10 @@ void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& f mSpeakers->speakerChatted(from_id); mSpeakers->setSpeakerTyping(from_id, FALSE); } + + if( mSessionType == P2P_SESSION || + mSessionType == ADHOC_SESSION) + LLRecentPeople::instance().add(from_id); } void LLIMModel::LLIMSession::addMessagesFromHistory(const std::list<LLSD>& history) diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index cb04dca18d..010dfd1b33 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -43,7 +43,6 @@ #include "llviewerobjectlist.h" #include "llvoavatar.h" #include "llworld.h" -#include "llrecentpeople.h" const F32 SPEAKER_TIMEOUT = 10.f; // seconds of not being on voice channel before removed from list of active speakers const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f); @@ -409,8 +408,6 @@ void LLSpeakerMgr::speakerChatted(const LLUUID& speaker_id) { speakerp->mLastSpokeTime = mSpeechTimer.getElapsedTimeF32(); speakerp->mHasSpoken = TRUE; - - LLRecentPeople::instance().add(speaker_id); } } |