diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-03 13:48:07 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-03 13:48:07 +0200 |
| commit | 22303da8a61e60dd061b5a63f6d023fd1345b59c (patch) | |
| tree | ebba692fbec9c76931592a289d1d6f7d2db69396 /indra/newview/llbottomtray.cpp | |
| parent | 5fac7f1d35336890d99333500da26c56643e5dc7 (diff) | |
Work on task EXT-3081 (Separate Message Well on Notifications Well and IM Well)
Initial commit
-- added two floater classes derived from LLSysWellWindow to work with Notification Well & IM Well
-- register two floaters in place of previous sys_well (but with the same xml file)
-- replace using of LLSysWellWindow with LLNotificationWellWindow in the out code (except of in LLScreenChannel::updateShowToastsState)
-- rename member variable in bottom tray used for Notification Well
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 6d3d61d4fe..002af391a6 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -54,7 +54,7 @@ template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance(); LLBottomTray::LLBottomTray(const LLSD&) : mChicletPanel(NULL), - mSysWell(NULL), + mNotificationWell(NULL), mSpeakPanel(NULL), mSpeakBtn(NULL), mNearbyChatBar(NULL), @@ -68,11 +68,11 @@ LLBottomTray::LLBottomTray(const LLSD&) LLUICtrlFactory::getInstance()->buildPanel(this,"panel_bottomtray.xml"); mChicletPanel = getChild<LLChicletPanel>("chiclet_list"); - mSysWell = getChild<LLNotificationChiclet>("sys_well"); + mNotificationWell = getChild<LLNotificationChiclet>("notification_well"); - // init mSysWell + // init mNotificationWell // set handler for a Click operation - mSysWell->setClickCallback(boost::bind(&LLSysWellWindow::onChicletClick, LLFloaterReg::getTypedInstance<LLSysWellWindow>("syswell_window"))); + mNotificationWell->setClickCallback(boost::bind(&LLNotificationWellWindow::onChicletClick, LLNotificationWellWindow::getInstance())); mChicletPanel->setChicletClickedCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1)); |