diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-07 22:55:07 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-07 22:55:07 +0000 |
| commit | 79653dfed48105019b8ecca9cf4bfaa2a390e100 (patch) | |
| tree | 455943795bf3371bbff0689604cf5eedd903fae4 /indra/newview/lltoolbar.cpp | |
| parent | a9b2296b2b5664cfc8d86c7f99c00c10268e250a (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
Diffstat (limited to 'indra/newview/lltoolbar.cpp')
| -rw-r--r-- | indra/newview/lltoolbar.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp index acd6856061..c7c9f07504 100644 --- a/indra/newview/lltoolbar.cpp +++ b/indra/newview/lltoolbar.cpp @@ -60,6 +60,7 @@ #include "llui.h" #include "llviewermenu.h" #include "llfirstuse.h" +#include "llpanelblockedlist.h" #include "llscrolllistctrl.h" #include "llscrolllistitem.h" #include "llscrolllistcell.h" @@ -69,7 +70,6 @@ #include "lltoolgrab.h" #include "llcombobox.h" #include "llfloaterchat.h" -#include "llfloatermute.h" #include "llimpanel.h" #include "lllayoutstack.h" @@ -297,11 +297,8 @@ void LLToolBar::updateCommunicateList() communicate_button->addSeparator(ADD_TOP); communicate_button->add(getString("Redock Windows"), LLSD("redock"), ADD_TOP); communicate_button->addSeparator(ADD_TOP); - LLFloaterMute* mute_instance = LLFloaterReg::getTypedInstance<LLFloaterMute>("mute"); - if(mute_instance) - { - communicate_button->add(mute_instance->getShortTitle(), LLSD("mute list"), ADD_TOP); - } + communicate_button->add(getString("Blocked List"), LLSD("mute list"), ADD_TOP); + std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it; if (gIMMgr->getIMFloaterHandles().size() > 0) @@ -379,7 +376,7 @@ void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, const LLSD& user_data) } else if (selected_option.asString() == "mute list") { - LLFloaterReg::showInstance("mute"); + LLPanelBlockedList::showPanelAndSelect(LLUUID::null); } else if (selected_option.isUndefined()) // user just clicked the communicate button, treat as toggle { |