diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
| commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
| tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/llviewerwindow.cpp | |
| parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 3e86f48cc5..f312cc0f63 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -184,6 +184,7 @@ #include "llviewernetwork.h" #include "llpostprocess.h" #include "llbottomtray.h" +#include "llnearbychatbar.h" #include "llnotificationmanager.h" @@ -1559,10 +1560,12 @@ void LLViewerWindow::initWorldUI() getRootView()->sendChildToFront(gSnapshotFloaterView); // new bottom panel + getRootView()->addChild(LLBottomTray::getInstance()); + // Make sure Bottom Tray is behind Side Tray regardless "addChild" order. + getRootView()->sendChildToBack(LLBottomTray::getInstance()); LLRect rc = LLBottomTray::getInstance()->getRect(); rc.mLeft = 0; rc.mRight = mRootView->getRect().getWidth(); - mRootView->addChild(LLBottomTray::getInstance()); LLBottomTray::getInstance()->reshape(rc.getWidth(),rc.getHeight(),FALSE); LLBottomTray::getInstance()->setRect(rc); @@ -1646,12 +1649,10 @@ void LLViewerWindow::initWorldUI() getRootView()->sendChildToFront(gMenuHolder); //Channel Manager - LLNotificationsUI::LLChannelManager * channel_manager - = LLNotificationsUI::LLChannelManager::getInstance(); + LLNotificationsUI::LLChannelManager* channel_manager = LLNotificationsUI::LLChannelManager::getInstance(); getRootView()->addChild(channel_manager); //Notification Manager - LLNotificationsUI::LLNotificationManager* notify_manager = - LLNotificationsUI::LLNotificationManager::getInstance(); + LLNotificationsUI::LLNotificationManager* notify_manager = LLNotificationsUI::LLNotificationManager::getInstance(); getRootView()->addChild(notify_manager); } @@ -2175,7 +2176,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask) LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus(); if( keyboard_focus ) { - LLLineEditor* chat_editor = LLBottomTray::instanceExists() ? LLBottomTray::getInstance()->getChatBox() : NULL; + LLLineEditor* chat_editor = LLBottomTray::instanceExists() ? LLBottomTray::getInstance()->getNearbyChatBar()->getChatBox() : NULL; // arrow keys move avatar while chatting hack if (chat_editor && chat_editor->hasFocus()) { |