From 71c0973a1eec0a58fcb143b268ac1069d16a4adb Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Tue, 5 Jan 2010 17:56:13 +0200 Subject: 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 --- indra/newview/llimview.cpp | 4 ++++ indra/newview/llspeakers.cpp | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview') 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& 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); } } -- cgit v1.2.3