diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:50:59 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:50:59 +0000 |
| commit | 7df79382a075646a51f21bed0d7f8de883fc3608 (patch) | |
| tree | e7a71ed0dc7e05e4091066e3a0455343dfcfce4f /indra/newview/llpanelgrouproles.cpp | |
| parent | 56449313529145a3d3c0e231967d9502b549056c (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
* Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868
* New Development: EXT-748 EXT-863 EXT-835
QA: Please test Recent List to verify it has no troubles.
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 48c9c16780..378a09e315 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -36,6 +36,7 @@ #include "llagent.h" #include "llbutton.h" +#include "llfiltereditor.h" #include "llfloatergroupinvite.h" #include "llavataractions.h" #include "lliconctrl.h" @@ -49,7 +50,6 @@ #include "lltabcontainer.h" #include "lltextbox.h" #include "lltexteditor.h" -#include "llsearcheditor.h" #include "llviewertexturelist.h" #include "llviewerwindow.h" #include "llfocusmgr.h" @@ -477,14 +477,12 @@ BOOL LLPanelGroupSubTab::postBuild() { // Hook up the search widgets. bool recurse = true; - mSearchEditor = getChild<LLSearchEditor>("filter_input", recurse); + mSearchEditor = getChild<LLFilterEditor>("filter_input", recurse); if (!mSearchEditor) return FALSE; - mSearchEditor->setCommitCallback(boost::bind(&LLPanelGroupSubTab::onClickSearch, this)); - mSearchEditor->setKeystrokeCallback(onSearchKeystroke, this); - + mSearchEditor->setCommitCallback(boost::bind(&LLPanelGroupSubTab::setSearchFilter, this, _2)); // Get icons for later use. mActionIcons.clear(); @@ -517,26 +515,6 @@ void LLPanelGroupSubTab::setGroupID(const LLUUID& id) } } -// static -void LLPanelGroupSubTab::onSearchKeystroke(LLLineEditor* caller, void* user_data) -{ - LLPanelGroupSubTab* self = static_cast<LLPanelGroupSubTab*>(user_data); - self->handleSearchKeystroke(caller); - -} - -void LLPanelGroupSubTab::handleSearchKeystroke(LLLineEditor* caller) -{ - setSearchFilter( caller->getText() ); -} - -// static -void LLPanelGroupSubTab::onClickSearch() -{ - setSearchFilter( mSearchEditor->getText() ); -} - - void LLPanelGroupSubTab::setSearchFilter(const std::string& filter) { lldebugs << "LLPanelGroupSubTab::setSearchFilter() ==> '" << filter << "'" << llendl; |