summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-11 08:59:19 -0400
committerOz Linden <oz@lindenlab.com>2010-10-11 08:59:19 -0400
commite2e70577f90d9551f4afe637bfd486654d778e5e (patch)
tree831de0c3fa62bc84d7e67f8c5041976efb60d84d /indra/newview/llbottomtray.cpp
parentecbc00351aed97cfe2f87267789732ff00c2333b (diff)
parentbb74487c859acccb8f88002630606419761136e4 (diff)
merged fix for STORM-222
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-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)
{