summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Productengine <adyukov@productengine.com>2010-10-06 19:15:49 +0300
committerAndrew Productengine <adyukov@productengine.com>2010-10-06 19:15:49 +0300
commit0fe2156f87bfc150eb465d66e20245c4ee3e3e8f (patch)
tree91ff36586357df9a64b904b5727b3003d6de9b04
parentbff186d8ef1d3463300975e4e1f2049f60e31b9f (diff)
STORM-187 ADDITIONAL FIX Fixed buttons autohiding in bottomtray on resize.
The bug was caused by moving nearby chat bar into panel inside layout panel instead of being layout panel itself in changeset 741eb25e921c without modifying get_panel_min_width() call which used that layout panel. This broke behaviour of LLBottomTray::processWidthDecreased(). - Fixed it by using this new nearby chat container layout panel in this call.
-rw-r--r--indra/newview/llbottomtray.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index ef6f2f7337..29c2b7565e 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -1026,7 +1026,7 @@ S32 LLBottomTray::processWidthDecreased(S32 delta_width)
processShrinkButtons(delta_width, buttons_freed_width);
}
// 3. Decreasing width of nearby chat.
- const S32 chatbar_panel_min_width = get_panel_min_width(mToolbarStack, mNearbyChatBar);
+ const S32 chatbar_panel_min_width = get_panel_min_width(mToolbarStack, mChatBarContainer);
const S32 chatbar_panel_width = mChatBarContainer->getRect().getWidth();
if (still_should_be_processed && chatbar_panel_width > chatbar_panel_min_width)
{