summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterperms.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-08-04 15:34:34 -0700
committerbrad kittenbrink <brad@lindenlab.com>2009-08-04 15:34:34 -0700
commit33cc363a6813bf6c1268fa85747d1d403e00f8e5 (patch)
treed30696b245c4b5eb70575582d0dd9ddc4b20e5c7 /indra/newview/llfloaterperms.cpp
parentdc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff)
parent89434ef6e64462041368ab26e049011fc84ae1e3 (diff)
Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.
Diffstat (limited to 'indra/newview/llfloaterperms.cpp')
-rw-r--r--indra/newview/llfloaterperms.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index c4f1ebe8aa..17bb8221ad 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -53,7 +53,8 @@ LLFloaterPerms::LLFloaterPerms(const LLSD& seed)
BOOL LLFloaterPerms::postBuild()
{
-
+ mCloseSignal.connect(boost::bind(&LLFloaterPerms::cancel, this));
+
refresh();
return TRUE;
@@ -106,14 +107,6 @@ void LLFloaterPerms::refresh()
mNextOwnerTransfer = gSavedSettings.getBOOL("NextOwnerTransfer");
}
-void LLFloaterPerms::onClose(bool app_quitting)
-{
- // Cancel any unsaved changes before closing.
- // Note: when closed due to the OK button this amounts to a no-op.
- cancel();
- destroy();
-}
-
//static
U32 LLFloaterPerms::getGroupPerms(std::string prefix)
{