summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Productengine <adyukov@productengine.com>2010-09-29 16:36:58 +0300
committerAndrew Productengine <adyukov@productengine.com>2010-09-29 16:36:58 +0300
commit283763d0909e581ee142f9c7ef749c81e653b3c3 (patch)
treee3be895576c5587ed80d94b3355d0c4c8959c7d2
parent704cdf2bc3cd8ce6c567117c0466f92f7279fd85 (diff)
STORM-291 FIXED Fixed the position of the nearby chat bar.
The bug was caused by moving nearby chat bar into panel inside layout panel instead of being layout panel itself without modifying code in LLBottomTray::loadButtonsOrder() which used that layout panel. - Fixed it by using this new nearby chat container layout panel in this method.
-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 33d006578d..ef6f2f7337 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)