diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-20 13:11:25 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-20 13:11:25 -0500 |
| commit | f08ab41c3e5d7824cb34378ba5a400795e7e888c (patch) | |
| tree | ff784c0fec58ecc94e6712e8d7dcdb75d842e71e /indra | |
| parent | 1d89f02243d2bcd39380181efa4ca04cc8bab16f (diff) | |
Importing patch for EXT-5571 for Beta 3 release. Fix by Callum originally.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 459a61dec3..3f60cec6da 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -915,7 +915,7 @@ void LLBottomTray::processShrinkButtons(S32* required_width, S32* buttons_freed_ else { // - mSpeakBtn->setLabelVisible(false); + //mSpeakBtn->setLabelVisible(false); // HACK: this button doesn't change size so label should not be turned off S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_shrink_width = panel_width - panel_min_width; @@ -1006,7 +1006,7 @@ void LLBottomTray::processExtendButtons(S32* available_width) S32 panel_max_width = mObjectDefaultWidthMap[RS_BUTTON_SPEAK]; S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_extend_width = panel_max_width - panel_width; - if (possible_extend_width > 0 && possible_extend_width <= *available_width) + if (possible_extend_width >= 0 && possible_extend_width <= *available_width) // HACK: this button doesn't change size so possible_extend_width will be 0 { mSpeakBtn->setLabelVisible(true); mSpeakPanel->reshape(panel_max_width, mSpeakPanel->getRect().getHeight()); |