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/llfloaterbeacons.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterbeacons.cpp') diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp index 5476b35dc8..052f334285 100644 --- a/indra/newview/llfloaterbeacons.cpp +++ b/indra/newview/llfloaterbeacons.cpp @@ -40,6 +40,7 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed) +: LLFloater() { LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml"); @@ -71,14 +72,13 @@ BOOL LLFloaterBeacons::postBuild() // Needed to make the floater visibility toggle the beacons. // Too bad we can't just add control_name="BeaconAlwaysOn" to the XML. -void LLFloaterBeacons::open() +void LLFloaterBeacons::onOpen(const LLSD& key) { - LLFloater::open(); gSavedSettings.setBOOL( "BeaconAlwaysOn", TRUE); } -void LLFloaterBeacons::close(bool app_quitting) +void LLFloaterBeacons::onClose(bool app_quitting) { - LLFloater::close(app_quitting); + destroy(); if(!app_quitting) { gSavedSettings.setBOOL( "BeaconAlwaysOn", FALSE); -- cgit v1.2.3