Merge 1.1.0 alpha into quickfilter

6 files changed, 70 insertions, 46 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/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 5b2d310..077ab23 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -12,9 +12,11 @@
                         <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
                              left_delta="65" name="reload" width="70" />
                         <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-                             left_delta="75" max_chars="255" name="address" width="280" />
+                             left_delta="75" max_chars="235" name="address" width="225" />
                         <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-                             left_delta="285" name="go" width="55" />
+                             left_delta="230" name="go" width="55" />
+                        <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
+                             left_delta="60" name="home" width="55" />
                 </layout_panel>
                 <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                      name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,6 +32,8 @@
                         <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
                              label="Always open in my web browser" left_delta="190" name="open_always"
                              width="200" />
+                        <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
+                             left="-265" name="set_home" width="155" />
                         <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
                              name="close" width="70" />
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d7ff80b..8d06657 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"

-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"

-     tear_off="false" width="802">

-        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="263" label="File" left="0" mouse_opaque="false" name="File"

-             opaque="true" tear_off="false" width="243">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"

-                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">

-                        <on_click function="File.Quit" userdata="" />

-                </menu_item_call>

-        </menu>

-        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"

-             opaque="true" tear_off="false" width="153">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"

-                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">

-                        <on_click function="ShowFloater" userdata="preferences" />

-                </menu_item_call>

-        </menu>

-        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="317" label="Help" left="80" mouse_opaque="false" name="Help"

-             opaque="true" tear_off="false" width="166">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"

-                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">

-                        <on_click function="ShowFloater" userdata="help f1" />

-                </menu_item_call>

-                <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0"

-                     mouse_opaque="true" name="About Second Life..." width="166">

-                        <on_click function="ShowFloater" userdata="about" />

-                </menu_item_call>

-        </menu>

-</menu_bar>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+     tear_off="false" width="802">
+        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="263" label="File" left="0" mouse_opaque="false" name="File"
+             opaque="true" tear_off="false" width="243">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
+                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
+                        <on_click function="File.Quit" userdata="" />
+                </menu_item_call>
+        </menu>
+        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+             opaque="true" tear_off="false" width="153">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
+                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
+                        <on_click function="ShowFloater" userdata="preferences" />
+                </menu_item_call>
+        </menu>
+        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="317" label="Help" left="80" mouse_opaque="false" name="Help"
+             opaque="true" tear_off="false" width="166">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
+                     mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
+                        <on_click function="ShowFloater" userdata="help f1" />
+                </menu_item_call>
+                <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
+                     mouse_opaque="true" name="About Imprudence..." width="166">
+                        <on_click function="ShowFloater" userdata="about" />
+                </menu_item_call>
+        </menu>
+</menu_bar>
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..682acb9 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
@@ -271,6 +271,11 @@
       <on_enable function="View.EnableLastChatter" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call name="Web Browser" label="Web Browser"
+                    shortcut="control|B">
+      <on_click function="ShowFloater" userdata="inworld browser" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_check name="Toolbar" label="Toolbar">
       <on_click function="ShowFloater" userdata="toolbar" />
       <on_check function="FloaterVisible" userdata="toolbar" />
@@ -360,9 +365,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">
@@ -608,6 +613,12 @@
                 userdata="movable" />
       <on_check control="SelectMovableOnly" />
     </menu_item_check>
+    <menu_item_check name="Select Only Copyable Objects"
+                     label="Select Only Copyable Objects">
+      <on_click function="Tools.SelectOnlyCopyableObjects"
+                userdata="copyable" />
+      <on_check control="SelectCopyableOnly" />
+    </menu_item_check>
     <menu_item_check name="Select By Surrounding"
                      label="Select By Surrounding">
       <on_click function="Tools.SelectBySurrounding"
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 6af19ee..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">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="FriendshipAccepted" tip="false">
                 <message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="RegionRestartMinutes" 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>