diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-11 17:49:43 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-11 17:49:43 -0800 |
| commit | 34558181c7fad95c235bca1e29c282ca09d136ba (patch) | |
| tree | ae68ae4ec8a85909e02cc1c2f89b414f073f357d | |
| parent | 08a7f4193b18ca5c0bbaf144232eeb2678205eae (diff) | |
CHUI-545: Problem: Sometimes the speaker indicator icons were not visible in the conversations panel. Resolution: The problem was that the visibility was set incorrectly. When the speaking indicator was not in the visible chain the state of the visiblity would be stored in a pending variable. If the visiblity changed before the pending variable was used, then this meant the pending variable overrode the most recent visibiltiy changes. So as a solution, if the visiblity changes then prevent the pending visiblity from being used.
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index e4621a7fc3..27c552b626 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -333,7 +333,9 @@ void LLOutputMonitorCtrl::switchIndicator(bool switch_on) LL_DEBUGS("SpeakingIndicator") << "Indicator is in visible chain, notifying parent: " << mSpeakerId << LL_ENDL; setVisible((BOOL)switch_on); notifyParentVisibilityChanged(); - } + //Visibility has just been updated so make sure not to use the pending visibility when ::draw executes (if one is pending) + mIsSwitchDirty = false; + } // otherwise remember necessary state and mark itself as dirty. // State will be applied in next draw when parents chain becomes visible. |