diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-16 11:43:08 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-16 11:43:08 -0500 |
commit | 9813df87af1d895a3183eb33648009fd70ce6ed7 (patch) | |
tree | 4cb519a2402856c7ede8d5ba5e8feff798ea6bdb /indra/newview/llfloatervoicedevicesettings.h | |
parent | adec0ba983c6b01c3d6c08692f3d5c7979ba90bb (diff) | |
parent | 073ec70829723e54f822052fe9c6c3e998e8dfca (diff) |
merge
--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; |