diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llfloatervoicedevicesettings.h | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.h')
| -rw-r--r-- | indra/newview/llfloatervoicedevicesettings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatervoicedevicesettings.h b/indra/newview/llfloatervoicedevicesettings.h index d30a57f161..addc674ae3 100644 --- a/indra/newview/llfloatervoicedevicesettings.h +++ b/indra/newview/llfloatervoicedevicesettings.h @@ -49,8 +49,8 @@ public: void apply(); void cancel(); void refresh(); - void onOpen(); - void onClose(bool app_quitting); + void initialize(); + void cleanup(); protected: static void onCommitInputDevice(LLUICtrl* ctrl, void* user_data); @@ -68,7 +68,7 @@ class LLFloaterVoiceDeviceSettings : public LLFloater, public LLFloaterSingleton { public: LLFloaterVoiceDeviceSettings(const LLSD& seed); - /*virtual*/ void onOpen(); + /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void onClose(bool app_quitting); /*virtual*/ void draw(); void apply(); |