diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
commit | 854e6acb424faa843f9bff7875927fcfec2cb1d4 (patch) | |
tree | 5a5f21c59ba6eb1c6551bb37538f3125c2c4ccbb /indra/newview/llfloatergroups.cpp | |
parent | 547bcc907389aeb1a3d974025b621e98d1178714 (diff) | |
parent | afaa076b7dd300a2836205fe6eb9ba5ab08bfb28 (diff) |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/newview/llfloatergroups.cpp')
-rw-r--r-- | indra/newview/llfloatergroups.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp index c71764c2e5..3952c54670 100644 --- a/indra/newview/llfloatergroups.cpp +++ b/indra/newview/llfloatergroups.cpp @@ -47,6 +47,7 @@ #include "llbutton.h" #include "llgroupactions.h" #include "llscrolllistctrl.h" +#include "llselectmgr.h" #include "lltextbox.h" #include "lluictrlfactory.h" #include "lltrans.h" @@ -89,6 +90,7 @@ BOOL LLFloaterGroupPicker::postBuild() list_ctrl->setContextMenu(LLScrollListCtrl::MENU_GROUP); } + LLSelectMgr::getInstance()->mUpdateSignal.connect(boost::bind(&LLFloaterGroupPicker::onBtnCancel, this)); childSetAction("OK", onBtnOK, this); |