diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-10-12 14:00:07 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-10-12 14:00:07 -0700 |
| commit | 683775aab87b815a09539ef621128f2e0007984e (patch) | |
| tree | 6bf066c7db7504201fd610dbc4a4a933c60c22b7 /indra/newview/llbottomtray.cpp | |
| parent | 58f0e78cb491833440d85e105593bccc2d2aa4ab (diff) | |
| parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -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) { |