diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-12 15:50:01 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-12 15:50:01 -0500 |
| commit | b8ac919d6fdf434c4c93ed60e85e14a0711ca4f8 (patch) | |
| tree | cb5926d357576b76f6f19f9c54470ece61f45d8f /indra/newview/llfloatervoicedevicesettings.h | |
| parent | ae8c1d1ea87b524797b2986f853745c0a124246c (diff) | |
| parent | 7ca1bfc78d91fea8b5c77fec7ac8cb7fa72aee9b (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.h')
| -rw-r--r-- | indra/newview/llfloatervoicedevicesettings.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoicedevicesettings.h b/indra/newview/llfloatervoicedevicesettings.h index d67283d0a2..20958af780 100644 --- a/indra/newview/llfloatervoicedevicesettings.h +++ b/indra/newview/llfloatervoicedevicesettings.h @@ -56,7 +56,6 @@ 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; |