diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-04 14:00:52 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-04 14:00:52 +0200 |
| commit | 1acc52a7e781a7931d1fc6bfc2313c49eb6be2a2 (patch) | |
| tree | 9fc3702fa546a28263627695cba7c6048d623cf6 /indra/newview/llbottomtray.cpp | |
| parent | 653ebfbe7ca53515d6c83f6ba72cbb1d3e2d9daf (diff) | |
Work on normal task EXT-3081 (Separate Message Well on Notifications Well and IM Well)
-- removed member pointer to Notification Well Icon from the LLBottomTray
-- placed Well counter over the Icon, made center-aligned
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index d80aa66257..8c793873f4 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -54,21 +54,24 @@ template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance(); LLBottomTray::LLBottomTray(const LLSD&) : mChicletPanel(NULL), - mNotificationWell(NULL), mSpeakPanel(NULL), mSpeakBtn(NULL), mNearbyChatBar(NULL), mToolbarStack(NULL) , mMovementButton(NULL) , mResizeState(RS_NORESIZE) -// Add more members +, mBottomTrayContextMenu(NULL) +, mMovementPanel(NULL) +, mCamPanel(NULL) +, mSnapshotPanel(NULL) +, mGesturePanel(NULL) +, mCamButton(NULL) { mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL); LLUICtrlFactory::getInstance()->buildPanel(this,"panel_bottomtray.xml"); mChicletPanel = getChild<LLChicletPanel>("chiclet_list"); - mNotificationWell = getChild<LLNotificationChiclet>("notification_well"); mChicletPanel->setChicletClickedCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1)); |