diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-07 15:58:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-07 15:58:20 -0700 |
| commit | c8cd7ef7a4da4482b776c37201b158a443dd737a (patch) | |
| tree | 521c6dc7af632dc9df64a69c18997eb091d68f20 /indra/newview/llbottomtray.cpp | |
| parent | d1ad7a56beee603b336600d4aace1e4d4c0f5ade (diff) | |
| parent | d25a30e55b7e6a20173c3a53891489adc5610d72 (diff) | |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -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 33d006578d..29c2b7565e 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -770,7 +770,7 @@ void LLBottomTray::loadButtonsOrder() } // Nearbychat is not stored in order settings file, but it must be the first of the panels, so moving it // manually here - mToolbarStack->movePanel(mNearbyChatBar, NULL, true); + mToolbarStack->movePanel(mChatBarContainer, NULL, true); } void LLBottomTray::onDraggableButtonMouseUp(LLUICtrl* ctrl, S32 x, S32 y) @@ -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) { |