Pull from richard/viewer-experience-fui

4 files changed, 11 insertions, 13 deletions

diff --git a/indra/newview/skins/default/textures/toolbar_icons/picks.png b/indra/newview/skins/default/textures/toolbar_icons/picks.png
index 4499bf562b..befda04b42 100644
--- a/indra/newview/skins/default/textures/toolbar_icons/picks.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/picks.png
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index da2be18db6..125ca81cde 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- can_dock="true"
  can_minimize="true"
- can_close="false"
+ can_close="true"
  follows="bottom"
  height="164"
  layout="topleft"
@@ -11,7 +10,6 @@
  help_topic="camera_floater"
  save_rect="true"
  save_visibility="true"
- save_dock_state="true"
  single_instance="true"
  width="228">
     <floater.string
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 21c9eb7437..bf9eeb6d26 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -60,9 +60,9 @@
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="340"
+           min_width="480"
            name="navigation_layout_panel"
-           width="340">
+           width="480">
 	<panel
 	 background_visible="false"
 	 follows="left|top|right"
@@ -71,7 +71,7 @@
 	 layout="topleft"
                left="0"
 	 name="navigation_panel"
-               width="340">
+     width="480">
 	     <pull_button
 	     follows="left|top"
 	     direction="down"
@@ -118,7 +118,7 @@
 	     mouse_opaque="false"
 	     name="location_combo"
 	     top_delta="0"
-                   width="215">
+            width="355">
          <combo_list
          mouse_wheel_opaque="true"/>
 	    </location_input>
@@ -149,9 +149,9 @@
 	     layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="335"
+           min_width="315"
            name="favorites_layout_panel"
-           width="335">
+           width="315">
     <favorites_bar
      follows="left|right|top"
      font="SansSerifSmall"
@@ -161,7 +161,7 @@
      name="favorite"
      image_drag_indication="Accordion_ArrowOpened_Off"
      tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-               width="331">
+               width="311">
         <label
          follows="left|top"
          height="15"
@@ -177,14 +177,12 @@
                  <!-- More button actually is a text box. -->
                  <more_button
                    follows="left|bottom"
-                   font.name="SansSerifSmall"
-                   font.style="UNDERLINE"
                    name=">>"
                      tab_stop="false"
                      tool_tip="Show more of My Favorites"
 		     top="15"
                    width="50">
-                   More...
+                   More &#9660;
                    </more_button>
   </favorites_bar>
          </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d12dda88be..f19cfa19f2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2051,6 +2051,8 @@ Returns a string with the requested data about the region
 	<string name="Marketplace Error Unsellable Item">Error: This item can not be sold on the marketplace.</string>
 	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
 
+	<string name="Open landmarks">Open landmarks</string>
+
 	<!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />