diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-06 22:20:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-06 22:20:43 -0700 |
| commit | 3f8d4f1ab5bf03ff5df522c964269a345927ddde (patch) | |
| tree | cb21d9f25418376b10fd439ad324b50033e058e1 /indra/newview | |
| parent | e0068b0cbd90c41aa23d8b0bf17a532306294305 (diff) | |
| parent | 0fe2156f87bfc150eb465d66e20245c4ee3e3e8f (diff) | |
STORM-187 : merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 2 |
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) { |