3 files changed, 18 insertions, 10 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
index a9bd613..6d74882 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="busy" title="IM Response Options" 
-         height="446" width="255" min_height="446" min_width="255"
+         height="476" width="265" min_height="476" min_width="265"
          follows="top|right" can_close="true" can_drag_on_left="false"
          can_minimize="true" can_resize="false" can_tear_off="false">
 
   <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
+     initial_value="false" label="Auto-respond to incoming IMs" left="10" mouse_opaque="true"
+     name="InstantMessageResponseEnabled" radio_style="false" width="270"/>
+  <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     initial_value="false" label="Announce incoming IMs" left="10" mouse_opaque="true"
      name="InstantMessageAnnounceIncoming" radio_style="false" width="270"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="Steal focus" left_delta="10" mouse_opaque="true" name="InstantMessageAnnounceStealFocus"
@@ -58,7 +61,7 @@
   
   <text_editor type="string" length="1" bottom_delta="-85" embedded_items="false" enabled="true"
      follows="left|top" font="SansSerifSmall" height="75" left_delta="-15" max_length="1100"
-     mouse_opaque="true" name="im_response" width="230" word_wrap="true"/>
+     mouse_opaque="true" name="im_response" width="245" word_wrap="true"/>
 
   <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="Send an item along with the response" left_delta="0"
@@ -66,28 +69,28 @@
      width="270"/>
 
   <view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="16" left_delta="0"
-     mouse_opaque="false" name="im_give_drop_target_rect" width="230"/>
+     mouse_opaque="false" name="im_give_drop_target_rect" width="245"/>
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
      drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
      height="16" left_delta="0" mouse_opaque="true" name="Give inventory" tool_tip="Drop an inventory item here to have it given along with the auto-response."
-     v_pad="2" width="230">
+     v_pad="2" width="245">
     Drop an inventory item here
   </text>
 
   <view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="0"
-     mouse_opaque="false" name="im_give_disp_rect" width="230"/>
+     mouse_opaque="false" name="im_give_disp_rect" width="245"/>
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
      drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
      height="16" left_delta="0" mouse_opaque="true" name="im_give_disp_rect_txt" tool_tip=""
-     v_pad="2" width="230">
+     v_pad="2" width="245">
     Currently set to: ITEM
   </text>
 
   <button bottom_delta="-26" follows="top|right" height="22" label="Cancel"
-     right="-10" name="btn_cancel" tool_tip="" enagled="true" width="80" />
+     right="-4" name="btn_cancel" tool_tip="" enagled="true" width="80" />
   <button bottom_delta="0" follows="top|right" height="22" label="OK"
-    right="-90" name="btn_ok" tool_tip="" enabled="true" width="80" />
+    right="-85" name="btn_ok" tool_tip="" enabled="true" width="80" />
   
 </floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 8033ba7..836c4dd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -503,6 +503,11 @@
     <menu_item_call name="Set Busy" label="Set Busy">
       <on_click function="World.SetBusy" userdata="" />
     </menu_item_call>
+    <menu_item_check name="Auto-Respond to IMs" label="Auto-Respond to IMs">
+      <on_click function="World.ToggleAutoResponse" userdata="" />
+      <on_check function="World.CheckAutoResponse" userdata="" />
+    </menu_item_check>
+    <menu_item_separator />
     <menu_item_call name="Stop Animating My Avatar" enabled="false"
                     label="Stop Animating My Avatar">
       <on_click function="Tools.StopAllAnimations" userdata="" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 58845ad..0904815 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -63,7 +63,7 @@
              font="SansSerifSmall" height="70" left="148" max_length="255"
              mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
   <button bottom_delta="-25" follows="top|right" height="22" label="IM Response Options"
-     left="164" name="busy_adv_btn" tool_tip="Auto response options"
+     left="164" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
      width="180" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-23" drop_shadow_visible="true" enabled="true" follows="left|top"