Automated merge up from viewer-development

5 files changed, 58 insertions, 49 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 1554ae390f..60cd82d227 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -928,12 +928,13 @@
              length="1"
              follows="left|top"
              left_pad="0"
-             height="30"
+             height="20"
              layout="topleft"
              name="Creator Name"
              top_delta="0"
              width="190"
-             word_wrap="true">
+             word_wrap="true"
+             use_ellipses="ture">
                 Mrs. Esbee Linden (esbee.linden)
             </text>
             <text
@@ -944,7 +945,7 @@
              height="19"
              layout="topleft"
              name="Owner:"
-             top_pad="3"
+             top_pad="13"
              width="90">
                 Owner:
             </text>
@@ -953,13 +954,14 @@
              type="string"
              length="1"
              follows="left|top"
-             height="30"
+             height="20"
              layout="topleft"
              name="Owner Name"
              left_pad="0"
              top_delta="0"
              width="190"
-             word_wrap="true">
+             word_wrap="true"
+             use_ellipses="true">
                 Mrs. Erica "Moose" Linden (erica.linden)
             </text>
            <text
@@ -970,7 +972,7 @@
              left="10"
              height="18"
              name="Group:"
-             top_pad="7"
+             top_pad="17"
              width="75">
                 Group:
             </text>
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index d90d0feda9..6ec063cd26 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -2,26 +2,26 @@
 <floater
   legacy_header_height="18"
   can_resize="true"
-  height="440"
+  height="775"
   layout="topleft"
-  min_height="140"
-  min_width="467"
+  min_height="400"
+  min_width="500"
   name="floater_web_content"
   help_topic="floater_web_content"
   save_rect="true"
   auto_tile="true"
   title=""
   initial_mime_type="text/html"
-  width="820">
+  width="735">
   <layout_stack
-    bottom="440"
+    bottom="775"
     follows="left|right|top|bottom"
     layout="topleft"
     left="5"
     name="stack1"
     orientation="vertical"
     top="20"
-    width="810">
+    width="725">
     <layout_panel
       auto_resize="false"
       default_tab_group="1"
@@ -32,14 +32,14 @@
       name="nav_controls"
       top="400"
       user_resize="false"
-      width="800">
+      width="725">
       <button
         image_overlay="Arrow_Left_Off"
-        image_disabled="PushButton_Disabled"
-        image_disabled_selected="PushButton_Disabled"
-        image_selected="PushButton_Selected"
-        image_unselected="PushButton_Off"
-        hover_glow_amount="0.15"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+		    hover_glow_amount="0.15"
         tool_tip="Navigate back"
         follows="left|top"
         height="22"
@@ -53,10 +53,10 @@
       </button>
       <button
         image_overlay="Arrow_Right_Off"
-        image_disabled="PushButton_Disabled"
-        image_disabled_selected="PushButton_Disabled"
-        image_selected="PushButton_Selected"
-        image_unselected="PushButton_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         tool_tip="Navigate forward"
         follows="left|top"
         height="22"
@@ -70,10 +70,10 @@
       </button>
       <button
         image_overlay="Stop_Off"
-        image_disabled="PushButton_Disabled"
-        image_disabled_selected="PushButton_Disabled"
-        image_selected="PushButton_Selected"
-        image_unselected="PushButton_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         tool_tip="Stop navigation"
         enabled="true"
         follows="left|top"
@@ -88,10 +88,10 @@
       </button>
       <button
         image_overlay="Refresh_Off"
-        image_disabled="PushButton_Disabled"
-        image_disabled_selected="PushButton_Disabled"
-        image_selected="PushButton_Selected"
-        image_unselected="PushButton_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         tool_tip="Reload page"
         follows="left|top"
         height="22"
@@ -115,7 +115,7 @@
         combo_editor.select_on_focus="true"
         tool_tip="Enter URL here"
         top_delta="0"
-        width="702">
+        width="627">
         <combo_box.commit_callback
           function="WebContent.EnterAddress" />
       </combo_box>
@@ -125,24 +125,24 @@
         follows="top|right"
         image_name="Lock2"
         layout="topleft"
-        left_delta="656"
+        left_delta="575"
         top_delta="2"
         visible="false" 
         tool_tip="Secured Browsing"
         width="16" />
       <button
         image_overlay="ExternalBrowser_Off"
-        image_disabled="PushButton_Disabled"
-        image_disabled_selected="PushButton_Disabled"
-        image_selected="PushButton_Selected"
-        image_unselected="PushButton_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         tool_tip="Open current URL in your desktop browser"
         follows="right|top"
         enabled="true" 
         height="22"
         layout="topleft"
         name="popexternal"
-        right="800"
+        right="725"
         top_delta="-2"
         width="22">
         <button.commit_callback
@@ -166,16 +166,16 @@
         top="0"/>
       <text
         type="string"
-        length="100"
+        length="200"
         follows="bottom|left"
         height="20"
         layout="topleft"
         left_delta="0"
         name="statusbartext"
         parse_urls="false"
-        text_color="0.4 0.4 0.4 1" 
+        text_color="0.4 0.4 0.4 1"
         top_pad="5"
-        width="452"/>
+        width="520"/>
       <progress_bar
         color_bar="0.3 1.0 0.3 1"
         follows="bottom|right"
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
index 6f46165883..1aeb166e01 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
@@ -25,6 +25,14 @@
          function="Places.LandmarksGear.Enable"
          parameter="category" />
     </menu_item_call>
+    <menu_item_call
+     label="Restore Item"
+     layout="topleft"
+     name="restore_item">
+        <menu_item_call.on_click
+         function="Places.LandmarksGear.Custom.Action"
+         parameter="restore" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
index 121e7cc07a..ff5fdd3795 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
@@ -60,6 +60,14 @@
          function="Places.LandmarksGear.Enable"
          parameter="category" />
     </menu_item_call>
+    <menu_item_call
+     label="Restore Item"
+     layout="topleft"
+     name="restore_item">
+        <menu_item_call.on_click
+         function="Places.LandmarksGear.Custom.Action"
+         parameter="restore" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cac25b9312..4fbe7b564f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6304,15 +6304,6 @@ An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_N
   </notification>
 
   <notification
-   duration="10"
-   icon="notifytip.tga"
-   name="ServerVersionChanged"
-   priority="high"
-   type="notifytip">
-You just entered a region using a different server version, which may affect performance. [[URL] View the release notes.]
-  </notification>
-
-  <notification
    icon="notifytip.tga"
    name="UnsupportedCommandSLURL"
    priority="high"