diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-12 14:21:05 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-12 14:21:05 +0100 |
commit | 50d5401e940f6a725edf72ec952dfc478b8cb438 (patch) | |
tree | a8b27fc05bf53054742a27d504a4dbc0d855ec92 /indra | |
parent | c574a819ec29b76805c5d81390f7d9e619a979f5 (diff) | |
parent | 4281e2bd01c64acd2c5b0ae106f890be7d2fc443 (diff) |
merge from viewer-release
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llfloatergroups.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp index 0bd8215e5c..43f158658a 100644 --- a/indra/newview/llfloatergroups.cpp +++ b/indra/newview/llfloatergroups.cpp @@ -47,7 +47,6 @@ #include "llbutton.h" #include "llgroupactions.h" #include "llscrolllistctrl.h" -#include "llselectmgr.h" #include "lltextbox.h" #include "lluictrlfactory.h" #include "lltrans.h" @@ -90,8 +89,6 @@ BOOL LLFloaterGroupPicker::postBuild() list_ctrl->setContextMenu(LLScrollListCtrl::MENU_GROUP); } - LLSelectMgr::getInstance()->mUpdateSignal.connect(boost::bind(&LLFloaterGroupPicker::onBtnCancel, this)); - childSetAction("OK", onBtnOK, this); childSetAction("Cancel", onBtnCancel, this); |