diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-29 14:49:56 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-29 14:49:56 +0100 |
| commit | 30b8d1a168042bd223849a23589ed96106f8e1a4 (patch) | |
| tree | a0d80a92f49be6478194d520264a74736543146b | |
| parent | 81051206e0c8ede5b2748e4aaedbaf6fdb7811c4 (diff) | |
| parent | 283763d0909e581ee142f9c7ef749c81e653b3c3 (diff) | |
merge storm-249
| -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 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) |