aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefsvoice.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llprefsvoice.h
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llprefsvoice.h')
-rw-r--r--linden/indra/newview/llprefsvoice.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/newview/llprefsvoice.h b/linden/indra/newview/llprefsvoice.h
index bb47b85..1fb5c66 100644
--- a/linden/indra/newview/llprefsvoice.h
+++ b/linden/indra/newview/llprefsvoice.h
@@ -34,7 +34,7 @@
34 34
35#include "llpanel.h" 35#include "llpanel.h"
36 36
37class LLFloaterDeviceSettings; 37class LLFloaterVoiceDeviceSettings;
38 38
39class LLPrefsVoiceLogic 39class LLPrefsVoiceLogic
40{ 40{
@@ -55,7 +55,6 @@ protected:
55 static void onClickSetKey(void* user_data); 55 static void onClickSetKey(void* user_data);
56 static void onClickSetMiddleMouse(void* user_data); 56 static void onClickSetMiddleMouse(void* user_data);
57 static void onEarLocationCommit(LLUICtrl* ctrl, void* user_data); 57 static void onEarLocationCommit(LLUICtrl* ctrl, void* user_data);
58 static void onClickLaunchWizard(void* user_data);
59 58
60 BOOL mEnableVoice; 59 BOOL mEnableVoice;
61 BOOL mVoiceCallsFriendsOnly; 60 BOOL mVoiceCallsFriendsOnly;
@@ -81,10 +80,10 @@ public:
81 void cancel(); 80 void cancel();
82 81
83protected: 82protected:
84 static void onClickDeviceSettingsBtn(void* user_data); 83 static void onClickVoiceDeviceSettingsBtn(void* user_data);
85 84
86 LLPrefsVoiceLogic* mLogic; 85 LLPrefsVoiceLogic* mLogic;
87 LLFloaterDeviceSettings* mDeviceSettings; 86 LLFloaterVoiceDeviceSettings* mVoiceDeviceSettings;
88}; 87};
89 88
90#endif // LLPREFSVOICE_H 89#endif // LLPREFSVOICE_H