1 files changed, 57 insertions, 73 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index 637c8ba..b6a7932 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -1,71 +1,64 @@
-<!-- This is the _embedded_ instant message panel, not the floater that
-     contains all the instant messages.  See floater_im.xml.  JC -->
-<floater border="true"
-     bottom="-298"
-     can_close="true"
-     can_drag_on_left="false"
-     can_minimize="true"
-     can_resize="true"
-     enabled="true"
-     follows="left|top|right|bottom"
-     height="297"
-     hidden="false"
-     label="(unknown)"
-     left="1"
-     min_height="155"
-     min_width="345"
-     mouse_opaque="true"
-     name="im_floater"
-     rect_control=""
-     title="(unknown)"
-     width="501"
-     default_tab_group="1">
-        <string name="ringing">Calling...</string>
-        <string name="connected">Connected, click End Call to hang up</string>
-        <string name="hang_up">Call ended</string>
-     
-    <button left="4" bottom="-40" height="20" width="70" label="Profile..." follows="left|top" name="profile_callee_btn"/>
-    <button left_delta="75" bottom="-40" height="20" width="70" label="Call" follows="left|top" name="start_call_btn"/>
-    <button left_delta="0" bottom="-40" height="20" width="70" label="End Call" follows="left|top" name="end_call_btn" visible="false"/>
-    <panel left_delta="72" bottom="-40" height="20" width="344" border="false" name="speaker_controls" follows="left|top|right">
-                <volume_slider
-                                name="speaker_volume"
-                                enabled="false"
-                                left="0"
-                                width="80"
-                                bottom="0"
-                                height="15"
-                                follows="left|bottom"
-                                min_val="0.0"
-                                max_val="1.0"
-                                increment="0.05"
-                                initial_val="0.5"
-                        />
-                <check_box
-                        name="mute_btn"
-                        enabled="false"
-                        left_delta="85"
-                        bottom_delta="0"
-                        width="70"
-                        height="25"
-                        label="Mute voice chat"
-                        />
-    </panel>
+<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
+     can_minimize="true" can_resize="true" default_tab_group="1"
+     follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
+     min_height="155" min_width="345" mouse_opaque="true" name="im_floater"
+     rect_control="" title="(unknown)" width="501">
+        <string name="ringing">
+                Calling...
+        </string>
+        <string name="answering">
+                Connecting...
+        </string>
+        <string name="connected">
+                Connected, click End Call to hang up
+        </string>
+        <string name="hang_up">
+                Call ended
+        </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
+        <string name="title_string">
+                Instant Message with [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] is typing...
+        </string>
+        <string name="session_start_string">
+                Starting session with [NAME] please wait.
+        </string>
+        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="4"
+             name="profile_callee_btn" width="80" />
+        <button bottom="-40" follows="left|top" halign="center" height="20"
+             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
+             label="Call" left_delta="85" name="start_call_btn" width="80" />
+        <button bottom="-40" follows="left|top" halign="right" height="20"
+             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+             label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"
+             pad_right="10"/>
+        <panel border="false" bottom="-40" follows="left|top|right" height="20"
+             left_delta="77" name="speaker_controls" width="344">
+                <volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05"
+                     initial_val="0.5" left="0" max_val="1.0" min_val="0.0"
+                     name="speaker_volume" width="80" />
+        <button bottom_delta="0" height="20"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" left_delta="85"
+             name="mute_btn" width="25" tool_tip="Mute voice"/>
+        </panel>
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              bottom="28" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="SansSerif" height="225"
-             hidden="false" left="4" max_length="2147483647" mouse_opaque="true"
-             name="im_history" text_color="ChatHistoryTextColor"
+             follows="left|top|right|bottom" font="SansSerif" height="225" left="4"
+             max_length="2147483647" mouse_opaque="true" name="im_history"
+             text_color="ChatHistoryTextColor"
              text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5"
-             enabled="true" follows="left|right|bottom" font="SansSerif"
-             handle_edit_keys_directly="false" height="20" hidden="false" left="6"
-             max_length="1022" mouse_opaque="true" name="chat_editor"
-             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-             width="421" label="Click here to instant message" />
-        <button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Send"
-             left="432" mouse_opaque="true" name="send_btn"
+             follows="left|right|bottom" font="SansSerif" height="20"
+             label="Click here to instant message" left="6" max_length="1022"
+             mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
+             select_on_focus="false" tab_group="1" width="421" />
+        <button bottom="4" follows="right|bottom" font="SansSerif" halign="center" height="20"
+             label="Send" left="432" mouse_opaque="true" name="send_btn"
              scale_image="true" width="60" />
         <text hidden="true" name="live_help_dialog" wordwrap="false">
                 *** Welcome to Help Request *** 
@@ -73,13 +66,4 @@ Please first check our SL Help Pages by pressing F1, or by accessing the Knowled
 If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
 -=-=- Response times will vary, especially during peak times -=-=-
         </text>
-        <text hidden="true" name="title_string">
-                Instant Message with [NAME]
-        </text>
-        <text hidden="true" name="typing_start_string">
-                [NAME] is typing...
-        </text>
-        <text hidden="true" name="session_start_string">
-            Starting session with [NAME] please wait.
-        </text>
 </floater>