From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 08:04:56 +0000 Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ignore-dead-branch --- indra/newview/llfloaterperms.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloaterperms.cpp') diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index 52fba0aa20..1ef71a9d53 100644 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -42,6 +42,7 @@ LLFloaterPerms::LLFloaterPerms(const LLSD& seed) +: LLFloater() { LLUICtrlFactory::getInstance()->buildFloater(this, "floater_perm_prefs.xml"); } @@ -64,7 +65,7 @@ void LLFloaterPerms::onClickOK(void* data) { LLFloaterPerms* self = static_cast(data); self->ok(); - self->close(); + self->closeFloater(); } //static @@ -72,7 +73,7 @@ void LLFloaterPerms::onClickCancel(void* data) { LLFloaterPerms* self = static_cast(data); self->cancel(); - self->close(); + self->closeFloater(); } //static @@ -117,7 +118,7 @@ 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(); - LLFloater::onClose(app_quitting); + destroy(); } //static -- cgit v1.3