merge

6 files changed, 225 insertions, 19 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 5b77f11d71..0569b4d515 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,7 +3,7 @@
  can_resize="true"
  can_minimize="true"
  can_close="false"
- height="202"
+ height="205"
  layout="topleft"
  min_height="124"
  min_width="190"
@@ -50,7 +50,7 @@
           user_resize="false" 
          auto_resize="false" 
          layout="topleft"
-         height="26"
+         height="20"
          name="my_panel">
             <avatar_icon
              enabled="false"
@@ -86,23 +86,38 @@
              visible="true"
              width="20" />
         </layout_panel>
-         <layout_panel
-          auto_resize="false"
-          user_resize="false" 
-          follows="top|left"
-          height="26"
-          visible="true"
-          layout="topleft"
-          name="leave_call_btn_panel"
-          width="100">
-           <button
-          follows="right|top"
-            height="23"
-            top_pad="0"
-            label="Leave Call"
-            name="leave_call_btn"
-            width="100" />
-         </layout_panel>
+        <layout_stack
+         clip="true"
+         auto_resize="false"
+         follows="left|top|right"
+         height="26"
+         layout="topleft"
+         mouse_opaque="false"
+         name="voice_effect_and_leave_call_stack"
+         orientation="horizontal"
+         width="262">
+          <panel
+           class="panel_voice_effect"
+           name="panel_voice_effect"
+           visiblity_control="VoiceMorphingEnabled"
+           filename="panel_voice_effect.xml" />
+          <layout_panel
+           auto_resize="false"
+           user_resize="false"
+           follows="top|right"
+           height="23"
+           visible="true"
+           layout="topleft"
+           name="leave_call_btn_panel"
+           width="100">
+            <button
+             follows="right|top"
+             height="23"
+             label="Leave Call"
+             name="leave_call_btn"
+             width="100" />
+          </layout_panel>
+        </layout_stack>
       <layout_panel
           follows="all"
           layout="topleft"
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..edc25348e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="420"
+ 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="330"
+ width="455">
+  <string name="no_voice_effect">
+    (No Voice Morph)
+  </string>
+  <string name="active_voice_effect">
+    (Active)
+  </string>
+  <string name="unsubscribed_voice_effect">
+    (Unsubscribed)
+  </string>
+  <string name="new_voice_effect">
+    (New!)
+  </string>
+  <text
+   height="68"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   follows="left|top|right"
+   layout="topleft"
+   left="10"
+   name="status_text"
+   right="-10"
+   top="25">
+To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
+
+To reconnect to Nearby Voice simply close this window.
+  </text>
+  <button
+   follows="left|top"
+   height="23"
+   label="Record Sample"
+   layout="topleft"
+   left="10"
+   name="record_btn"
+   tool_tip="Record a sample of your voice."
+   top_pad="5"
+   width="150">
+    <button.commit_callback
+     function="VoiceEffect.Record" />
+  </button>
+  <button
+   follows="left|top"
+   height="23"
+   label="Stop"
+   layout="topleft"
+   left_delta="0"
+   name="record_stop_btn"
+   top_delta="0"
+   width="150">
+    <button.commit_callback
+     function="VoiceEffect.Stop" />
+  </button>
+  <text
+   height="18"
+   halign="right"
+   use_ellipses="true"
+   type="string"
+   follows="left|top|right"
+   layout="topleft"
+   left_pad="10"
+   name="voice_morphing_link"
+   right="-10"
+   top_delta="5">
+    [[URL] Get Voice Morphing]
+  </text>
+  <scroll_list
+   bottom="-10"
+   draw_heading="true"
+   follows="all"
+   layout="topleft"
+   left="10"
+   multi_select="false"
+   name="voice_effect_list"
+   right="-10"
+   tool_tip="Record a sample of your voice, then click an effect to preview."
+   top="128">
+    <scroll_list.columns
+     label="Voice Morph"
+     name="name" relative_width="0.41"/>
+    <scroll_list.columns
+     dynamic_width="true"
+     label="Expires"
+     name="expires"
+	 relative_width="0.59" />
+  </scroll_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index aff8f7ddf4..2641ce4ee4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -80,6 +80,17 @@
              function="Floater.Toggle"
              parameter="gestures" />
         </menu_item_check>
+        <menu_item_check
+         label="My Voice"
+         name="ShowVoice"
+         visibility_control="VoiceMorphingEnabled">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="voice_effect" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="voice_effect" />
+        </menu_item_check>
         <menu
          label="My Status"
          name="Status"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5ead756d20..0b996a758e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5981,6 +5981,50 @@ We are creating a voice channel for you. This may take up to one minute.
   </notification>
 
   <notification
+   icon="notify.tga"
+   name="VoiceEffectsExpired"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+One or more of your subscribed Voice Morphs has expired.
+[[URL] Click here] to renew your subscription.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsExpiredInUse"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+The active Voice Morph has expired, your normal voice settings have been applied.
+[[URL] Click here] to renew your subscription.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsWillExpire"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+One or more of your Voice Morphs will expire in less than [INTERVAL] days.
+[[URL] Click here] to renew your subscription.
+    <unique/>
+  </notification>
+		LLNotificationsUtil::add("VoiceEffectsNew");
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsNew"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+New Voice Morphs are available!
+    <unique/>
+  </notification>
+
+  <notification
    icon="notifytip.tga"
    name="Cannot enter parcel: not a group member"
    type="notifytip">
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
new file mode 100644
index 0000000000..c575ca468c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="all"
+ height="26"
+ layout="topleft"
+ name="panel_voice_effect"
+ width="200">
+  <string name="no_voice_effect">
+    No Voice Morph
+  </string>
+  <string name="preview_voice_effects">
+    Preview Voice Morphing  ▶
+  </string>
+  <string name="get_voice_effects">
+    Get Voice Morphing  ▶
+  </string>
+  <combo_box
+   enabled="false"
+   follows="left|top|right"
+   height="23"
+   name="voice_effect"
+   tool_tip="Select a Voice Morphing effect to change your voice."
+   top_pad="0"
+   width="200">
+    <combo_box.item
+     label="No Voice Morph"
+     name="no_voice_effect"
+	 top_pad="0"
+     value="0" />
+    <combo_box.commit_callback
+     function="Voice.CommitVoiceEffect" />
+  </combo_box>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ed6484302f..3bd57c05aa 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3093,6 +3093,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		The session initialization is timed out
 	</string>
   
+  <string name="voice_morphing_url">http://secondlife.com/landing/v0icem0rphingt3st</string>
+
   <!-- Financial operations strings -->
   <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
   <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>