Second Life viewer sources 1.19.1.4

1 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 9751ea7..773ddfe 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -93,7 +93,7 @@ void LLPrefsVoiceLogic::init()
         mEnableVoice = gSavedSettings.getBOOL("EnableVoiceChat");
 
         mVoiceCallsFriendsOnly = gSavedSettings.getBOOL("VoiceCallsFriendsOnly");
-        mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk");
+//      mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk");
         mModifier = gSavedSettings.getString("PushToTalkButton");
         mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle");
         mEarLocation = gSavedSettings.getS32("VoiceEarLocation");
@@ -122,17 +122,17 @@ void LLPrefsVoiceLogic::refresh()
         mPanel->childSetEnabled("push_to_talk_check", enable);
         mPanel->childSetEnabled("push_to_talk_label", enable);
         mPanel->childSetEnabled("voice_call_friends_only_check", enable);
-        mPanel->childSetEnabled("push_to_talk_toggle_check", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/);
+        mPanel->childSetEnabled("push_to_talk_toggle_check", enable);
         mPanel->childSetEnabled("ear_location", enable);
-        mPanel->childSetEnabled("set_voice_hotkey_button", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/);
-        mPanel->childSetEnabled("set_voice_middlemouse_button", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/);
+        mPanel->childSetEnabled("set_voice_hotkey_button", enable);
+        mPanel->childSetEnabled("set_voice_middlemouse_button", enable);
 }
 
 void LLPrefsVoiceLogic::cancel()
 {
         gSavedSettings.setBOOL("EnableVoiceChat", mEnableVoice);
         gSavedSettings.setBOOL("VoiceCallsFriendsOnly", mVoiceCallsFriendsOnly);
-        gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk );
+//      gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk );
         gSavedSettings.setString("PushToTalkButton", mModifier);
         gSavedSettings.setBOOL("PushToTalkToggle", mPushToTalkToggle );
         gSavedSettings.setS32("VoiceEarLocation", mEarLocation);