Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public

1 files changed, 149 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
new file mode 100644
index 0000000000..7335488e73
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="415"
+ name="voice_effects"
+ help_topic="voice_effects"
+ title="PREVIEW VOICE MORPHING"
+ background_visible="true"
+ follows="all"
+ label="Places"
+ layout="topleft"
+ min_height="350"
+ min_width="240"
+ width="313">
+  <string name="no_voice_effect">
+    (No Voice Effect)
+  </string>
+  <string name="active_voice_effect">
+    (Active)
+  </string>
+  <string name="new_voice_effect">
+    New!
+  </string>
+  <scroll_list
+   bottom_delta="300"
+   draw_heading="true"
+   follows="all"
+   layout="topleft"
+   left="0"
+   multi_select="false"
+   tool_tip="Record a sample of your voice, then click an effect to preview."
+   top="20"
+   name="voice_effect_list">
+    <scroll_list.columns
+     label="Name"
+     name="name"
+     width="153" />
+    <scroll_list.columns
+     label="New"
+     name="new"
+     width="64" />
+    <scroll_list.columns
+     label="Expires"
+     name="expires"
+     width="100" />
+  </scroll_list>
+  <panel
+   background_visible="true"
+   bevel_style="none"
+   top_pad="0"
+   follows="left|right|bottom"
+   height="30"
+   label="bottom_panel"
+   layout="topleft"
+   left="0"
+   name="bottom_panel"
+   width="313">
+<!--
+    <menu_button
+     follows="bottom|left"
+     height="18"
+     image_disabled="OptionsMenu_Disabled"
+     image_selected="OptionsMenu_Press"
+     image_unselected="OptionsMenu_Off"
+     layout="topleft"
+     left="10"
+     menu_filename="menu_voice_effect_gear.xml"
+     name="gear_btn"
+     top="5"
+     tool_tip="More options"
+     width="18" />
+-->
+    <button
+     follows="bottom|left"
+     font="SansSerifBigBold"
+     height="18"
+     image_selected="AddItem_Press"
+     image_unselected="AddItem_Off"
+     image_disabled="AddItem_Disabled"
+     layout="topleft"
+     left="10"
+     name="add_voice_effect_btn"
+     tool_tip="Get more voice effects"
+     top="5"
+     width="18">
+      <button.commit_callback
+       function="VoiceEffect.Add" />
+    </button>
+<!--
+    <button
+     follows="bottom|left"
+     font="SansSerifBigBold"
+     height="10"
+     image_hover_selected="Activate_Checkmark"
+     image_selected="Activate_Checkmark"
+     image_unselected="Activate_Checkmark"
+     layout="topleft"
+     left_pad="5"
+     name="activate_btn"
+     tool_tip="Activate/Deactivate selected voice effect"
+     top="10"
+     width="10">
+      <button.commit_callback
+       function="VoiceEffect.Activate" />
+    </button>
+-->
+  </panel>
+  <text
+   height="40"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   text_color="LabelSelectedDisabledColor"
+   length="1"
+   follows="left|bottom|right"
+   layout="topleft"
+   left="6"
+   name="status_text"
+   top_pad="10"
+   width="300">
+    Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
+  </text>
+  <button
+   follows="left|bottom"
+   height="23"
+   label="Record Sample"
+   layout="topleft"
+   left="6"
+   name="record_btn"
+   tool_tip="Record a sample of your voice."
+   top_pad="5"
+   width="135">
+    <button.commit_callback
+     function="VoiceEffect.Record" />
+  </button>
+  <button
+   follows="left|bottom"
+   height="23"
+   label="Stop"
+   layout="topleft"
+   left_delta="0"
+   name="record_stop_btn"
+   top_delta="0"
+   width="135">
+    <button.commit_callback
+     function="VoiceEffect.Stop" />
+  </button>
+</floater>