Merge branch 'next' into openal

4 files changed, 14 insertions, 11 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index c3058c4..076598c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -36,9 +36,12 @@
         </string>
         <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
              name="profile_callee_btn" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif"
+             halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
+             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <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="100" />
+             label="Call" left_delta="107" name="start_call_btn" width="100" />
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
@@ -51,9 +54,6 @@
                      image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
                      name="mute_btn" tool_tip="Mute voice" width="25" />
         </panel>
-        <button bottom_delta="0" follows="right|top" font="SansSerif"
-             halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
-             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              bottom="30" embedded_items="false" enabled="false"
              follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
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 71044a0..a4f367c 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
@@ -360,9 +360,9 @@
       <on_click function="View.HighlightTransparent" userdata="" />
       <on_check function="View.CheckHighlightTransparent" />
     </menu_item_check>
-    <menu_item_check name="Beacons Always On" label="Beacons Always On">
-      <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
-      <on_check control="BeaconAlwaysOn" />
+    <menu_item_check name="Beacons Always On" label="Show Beacons">
+      <on_click function="ToggleControl" userdata="BeaconsEnabled" />
+      <on_check control="BeaconsEnabled" />
     </menu_item_check>
     <menu name="Beacons" create_jump_keys="true" label="Beacons"
           opaque="true" tear_off="true">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index d169741..d207a74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -579,6 +579,9 @@ to his or her location:
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="OfferFriendshipNoMessage" tip="false">
                 <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 6fa099e..c47985b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -25,15 +25,15 @@
              label="IM/Call" left_delta="0" name="IM"
              tool_tip="Open Instant Message session" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Info" name="Info" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Activate" name="Activate" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Leave" name="Leave" width="80" />
+             label="Invite..." name="Invite..." width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Info" name="Info" width="80" />
         <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
              label="Create..." name="Create" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Search..." name="Search..." width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Invite..." name="Invite..." width="80" />
+             label="Leave" name="Leave" width="80" />
 </panel>