Backed out changeset: d38e4f4982a0

indra/newview/app_settings/settings_minimal.xml

@@ -52,7 +52,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>0</integer>
+            <integer>1</integer>
         </map>
     <key>HelpURLFormat</key>
         <map>
@@ -124,7 +124,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>0</integer>
         </map>
     <key>VoiceDisableMic</key>
         <map>
@@ -133,7 +133,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>0</integer>
         </map>
       <key>ScriptsCanShowUI</key>
       <map>
@@ -290,7 +290,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>EnableAvatarShare</key>
     <map>

indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml

@@ -42,5 +42,40 @@
              show_speaking_indicator="false"
              width="147" />
         </layout_panel>
+      <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="130"
+         name="call_btn_panel"
+         user_resize="false"
+         visible="false">
+        <button
+         follows="all"
+         height="20"
+         label="Call"
+         name="call_btn"
+         width="130"
+         top="5" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       follows="top|left|right"
+       height="25"
+       layout="topleft"
+       min_height="25"
+       width="130"
+       name="end_call_btn_panel"
+       user_resize="false"
+       visible="false">
+        <button
+         follows="all"
+         height="20"
+         label="Leave Call"
+         name="end_call_btn"
+         top="5"/>
+      </layout_panel>
     </layout_stack>
 </panel>

indra/newview/skins/minimal/xui/en/panel_bottomtray.xml

@@ -61,6 +61,44 @@
 		</layout_panel>
     <layout_panel
         auto_resize="false"
+        follows="left|right"
+        height="28"
+        layout="topleft"
+        min_height="28"
+        min_width="59"
+        mouse_opaque="false"
+        name="speak_panel"
+        top_delta="0"
+        user_resize="false"
+        width="108">
+      <talk_button
+       follows="left|right"
+       height="23"
+       layout="topleft"
+       left="0"
+       name="talk"
+       top="5"
+       width="105">
+        <show_button
+         tab_stop="true">
+          <init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="voice_controls" />
+        </show_button>
+        <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
+                 & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
+        <speak_button
+         halign="center"
+         label="Speak"
+         label_selected="Speak"
+         name="speak_btn"
+         pad_right="20"
+         tab_stop="true"
+         use_ellipses="true" />
+      </talk_button>
+    </layout_panel>
+		<layout_panel
+         auto_resize="false"
          follows="right"
          height="28"
          layout="topleft"

indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml

@@ -77,6 +77,39 @@
              tool_tip = "Offer to teleport this person"
              width="140" />
       </layout_panel>
+      <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="140"
+         name="call_btn_panel"
+         user_resize="false">
+        <button
+         follows="left|top|right"
+         height="23"
+         label="Call"
+         name="call_btn"
+         width="140" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       follows="top|left|right"
+       height="25"
+       layout="topleft"
+       min_height="25"
+       width="140"
+       name="end_call_btn_panel"
+       user_resize="false"
+       visible="false">
+        <button
+         follows="left|top|right"
+         height="23"
+         label="End Call"
+         name="end_call_btn"
+         width="140" />
+      </layout_panel>
       <layout_panel
        mouse_opaque="false"
        auto_resize="true"