diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
commit | 5b8c1851f2b565fddaab28e23add62f621f15082 (patch) | |
tree | d8525d0f5dd985efb86dcb50e752e19d59a7fb2d /indra/newview/llfloatergroups.cpp | |
parent | 94fde578cd845b1a648e66ecf184e7a24beaad6d (diff) | |
parent | 3bb5d368a21e2645222f0f5fa57b0a0abb236084 (diff) |
automated merge
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); |