livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.

meow-7.2.2
William Todd Stinson 2012-10-22 17:40:48 -07:00
parent 0d25cca2e1 364e811867
commit f3ede9d46c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llimfloatercontainer.cpp
View File

@ -1113,6 +1113,9 @@ void LLIMFloaterContainer::setItemSelect(const LLUUID& session_id)
mSelectedSession = session_id;
LLFolderViewItem* widget = mConversationsWidgets[session_id];
(widget->getRoot())->setSelection(widget, FALSE, FALSE);
// Scroll to selected item
mConversationsRoot->scrollToShowSelection();
}
}
}
@ -1228,6 +1231,9 @@ void LLIMFloaterContainer::addConversationListItem(const LLUUID& uuid, bool isWi
// set the widget to minimized mode if conversations pane is collapsed
widget->toggleMinimizedMode(mConversationsPane->isCollapsed());
// scroll to newly added item
mConversationsRoot->scrollToShowSelection();
return;
}

4
indra/newview/llspeakers.cpp
View File

@ -533,8 +533,8 @@ void LLSpeakerMgr::updateSpeakerList()
LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id);
for (uuid_vec_t::iterator it = session->mInitialTargetIDs.begin();it!=session->mInitialTargetIDs.end();++it)
{
// We only add avatars that are on line
if (LLAvatarTracker::instance().isBuddyOnline(*it))
// Allow to set buddies if they are on line. Allow any other avatar.
if (!LLAvatarTracker::instance().isBuddy(*it) || LLAvatarTracker::instance().isBuddyOnline(*it))
{
setSpeaker(*it, "", LLSpeaker::STATUS_VOICE_ACTIVE, LLSpeaker::SPEAKER_AGENT);
}