diff options
author | Jacek Antonelli | 2008-09-12 14:59:33 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-12 14:59:39 -0500 |
commit | 80a8bab2a9dd8e77262b001af973212a6cba4a5a (patch) | |
tree | 170168232fd4e2eec5f15295a9445535969cdb76 /linden/indra/newview/llprefsvoice.cpp | |
parent | Second Life viewer sources 1.21.1-RC (diff) | |
download | meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.zip meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.gz meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.bz2 meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.xz |
Second Life viewer sources 1.21.2-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llprefsvoice.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp index 5aa2cf4..6661f08 100644 --- a/linden/indra/newview/llprefsvoice.cpp +++ b/linden/indra/newview/llprefsvoice.cpp | |||
@@ -96,7 +96,6 @@ void LLPrefsVoiceLogic::init() | |||
96 | mEnableVoice = gSavedSettings.getBOOL("EnableVoiceChat"); | 96 | mEnableVoice = gSavedSettings.getBOOL("EnableVoiceChat"); |
97 | 97 | ||
98 | mVoiceCallsFriendsOnly = gSavedSettings.getBOOL("VoiceCallsFriendsOnly"); | 98 | mVoiceCallsFriendsOnly = gSavedSettings.getBOOL("VoiceCallsFriendsOnly"); |
99 | // mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk"); | ||
100 | mModifier = gSavedSettings.getString("PushToTalkButton"); | 99 | mModifier = gSavedSettings.getString("PushToTalkButton"); |
101 | mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle"); | 100 | mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle"); |
102 | mEarLocation = gSavedSettings.getS32("VoiceEarLocation"); | 101 | mEarLocation = gSavedSettings.getS32("VoiceEarLocation"); |
@@ -139,7 +138,6 @@ void LLPrefsVoiceLogic::cancel() | |||
139 | { | 138 | { |
140 | gSavedSettings.setBOOL("EnableVoiceChat", mEnableVoice); | 139 | gSavedSettings.setBOOL("EnableVoiceChat", mEnableVoice); |
141 | gSavedSettings.setBOOL("VoiceCallsFriendsOnly", mVoiceCallsFriendsOnly); | 140 | gSavedSettings.setBOOL("VoiceCallsFriendsOnly", mVoiceCallsFriendsOnly); |
142 | // gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk ); | ||
143 | gSavedSettings.setString("PushToTalkButton", mModifier); | 141 | gSavedSettings.setString("PushToTalkButton", mModifier); |
144 | gSavedSettings.setBOOL("PushToTalkToggle", mPushToTalkToggle ); | 142 | gSavedSettings.setBOOL("PushToTalkToggle", mPushToTalkToggle ); |
145 | gSavedSettings.setS32("VoiceEarLocation", mEarLocation); | 143 | gSavedSettings.setS32("VoiceEarLocation", mEarLocation); |