summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-12 14:21:05 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-12 14:21:05 +0100
commit381edec27842714faf36f3b6e64ade1c18e75118 (patch)
treea8b27fc05bf53054742a27d504a4dbc0d855ec92 /indra/newview
parenta49a4e84a03adb63e4cb4a7ee3ad9202b3aa5361 (diff)
parentb619184d418bec1cdd2f4e0820ebbb05a7e19a02 (diff)
merge from viewer-release
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatergroups.cpp3
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);