diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
commit | ace0be2a7c0665e382e47aeedfcffed7410e11a9 (patch) | |
tree | 2d437342310d52806c6b378f1046ad56d9eb6456 /indra/newview/llfloatervoicedevicesettings.h | |
parent | 90bb29245cbd9626f840f1d16c351ac415f7c35e (diff) | |
parent | 1e5f2f5d8c4264cc704c687aa1b624296b6444e2 (diff) |
merge with avp-tip
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.h')
-rw-r--r-- | indra/newview/llfloatervoicedevicesettings.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatervoicedevicesettings.h b/indra/newview/llfloatervoicedevicesettings.h index 20958af780..d67283d0a2 100644 --- a/indra/newview/llfloatervoicedevicesettings.h +++ b/indra/newview/llfloatervoicedevicesettings.h @@ -56,6 +56,7 @@ protected: static void onCommitInputDevice(LLUICtrl* ctrl, void* user_data); static void onCommitOutputDevice(LLUICtrl* ctrl, void* user_data); + F32 mMicVolume; std::string mInputDevice; std::string mOutputDevice; class LLComboBox *mCtrlInputDevices; |