diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 16:12:56 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 16:12:56 -0700 |
commit | 146e084af3344ada737340115c5fa063c0aab6b3 (patch) | |
tree | 19e0115569a06f9ec27bd7c482a1066c99afb501 /indra/newview/llfloatervoicedevicesettings.cpp | |
parent | d2464757c6fa86caa30a13071cb43047de2dd2ff (diff) | |
parent | 584d0ac64e973da3a9096fb85b796716255988be (diff) |
Merged in latest svn-imports-viewer-20 changes.
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.cpp')
-rw-r--r-- | indra/newview/llfloatervoicedevicesettings.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp index a7658d90e9..b64257b11d 100644 --- a/indra/newview/llfloatervoicedevicesettings.cpp +++ b/indra/newview/llfloatervoicedevicesettings.cpp @@ -293,11 +293,11 @@ LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed) } BOOL LLFloaterVoiceDeviceSettings::postBuild() { - mCloseSignal.connect(boost::bind(&LLFloaterVoiceDeviceSettings::onClose, this)); - center(); return TRUE; } + +// virtual void LLFloaterVoiceDeviceSettings::onOpen(const LLSD& key) { if(mDevicePanel) @@ -306,7 +306,8 @@ void LLFloaterVoiceDeviceSettings::onOpen(const LLSD& key) } } -void LLFloaterVoiceDeviceSettings::onClose() +// virtual +void LLFloaterVoiceDeviceSettings::onClose(bool app_settings) { if(mDevicePanel) { |