Second Life viewer sources 1.19.1.4

3 files changed, 10 insertions, 10 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
index 49bdde9..a887c54 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
@@ -2,7 +2,7 @@
 <floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="true" can_tear_off="true" enabled="true" height="270" left="15"
      min_height="150" min_width="425" mouse_opaque="true" name="chat floater"
-     rect_control="FloaterChatRect" title="Local Chat (history)" width="435">
+     rect_control="FloaterChatRect" title="Local Chat" width="435">
         <string name="ringing">
                 Connecting to in-world Voice Chat...
         </string>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
index 720f1c4..1314971 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -36,11 +36,11 @@
              name="voice_chat_description" tab_stop="false" width="450" word_wrap="true">

                 Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.

         </text_editor>

-        <check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true"

-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

-             label="Start Viewer in Push-to-Talk mode" left_delta="0"

-             mouse_opaque="true" name="push_to_talk_check" radio_style="false"

-             width="200" />

+<!--    <check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true" -->

+<!--         follows="left|top" font="SansSerifSmall" height="16" initial_value="false" -->

+<!--         label="Start Viewer in Push-to-Talk mode" left_delta="0" -->

+<!--         mouse_opaque="true" name="push_to_talk_check" radio_style="false" -->

+<!--         width="200" /> -->

         <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"

              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

              label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true"

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
index 1fb6b97..0ecf3fc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
@@ -20,10 +20,10 @@
              font="SansSerifSmall" height="16" initial_value="false"

              label="Only allow Friends to initiate Voice Calls with me" left="20"

              left_delta="2" name="friends_only_check" width="200" />

-        <check_box bottom_delta="-20" control_name="EnablePushToTalk" follows="left|top"

-             font="SansSerifSmall" height="16" initial_value="false"

-             label="Start Viewer in Push-to-Talk mode" left_delta="0"

-             name="push_to_talk_check" width="200" />

+<!--    <check_box bottom_delta="-20" control_name="EnablePushToTalk" follows="left|top" -->

+<!--         font="SansSerifSmall" height="16" initial_value="false" -->

+<!--         label="Start Viewer in Push-to-Talk mode" left_delta="0" -->

+<!--         name="push_to_talk_check" width="200" /> -->

         <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"

              font="SansSerifSmall" height="16" initial_value="false"

              label="Use Push-to-Talk in toggle mode" left_delta="0"