diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-06 13:53:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-06 13:53:37 -0500 |
| commit | 4a0311f8c566b95258e8f9a0df897ffee1e72e00 (patch) | |
| tree | 0833fd3eeb043c17c370496172eb364588c69d43 | |
| parent | f54caff1e4c669c330c67def7092f2945991ae1d (diff) | |
| parent | 6e2b3fd634b909c534f27898c8658f0029244ff9 (diff) | |
merge changes for storm-1712
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llparticipantlist.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ea9ccd576e..a3214d4c33 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -590,6 +590,7 @@ Jonathan Yap STORM-1659 STORM-1674 STORM-1685 + STORM-1712 STORM-1728 Kadah Coba STORM-1060 diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index fb1153980a..5c95e805ce 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -468,7 +468,7 @@ void LLParticipantList::setValidateSpeakerCallback(validate_speaker_callback_t c void LLParticipantList::updateRecentSpeakersOrder() { - if (E_SORT_BY_RECENT_SPEAKERS == getSortOrder()) + if (E_SORT_BY_RECENT_SPEAKERS == getSortOrder() && !isHovered()) { // Need to update speakers to sort list correctly mSpeakerMgr->update(true); @@ -477,6 +477,13 @@ void LLParticipantList::updateRecentSpeakersOrder() } } +bool LLParticipantList::isHovered() +{ + S32 x, y; + LLUI::getMousePositionScreen(&x, &y); + return mAvatarList->calcScreenRect().pointInRect(x, y); +} + bool LLParticipantList::onAddItemEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata) { LLUUID uu_id = event->getValue().asUUID(); diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index e0b3d42c25..a001d29b67 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -251,6 +251,8 @@ private: */ void adjustParticipant(const LLUUID& speaker_id); + bool isHovered(); + LLSpeakerMgr* mSpeakerMgr; LLAvatarList* mAvatarList; |