merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1908 https://svn.aws.productengine.com/secondlife/pe/stable-2@1917 -> viewer-2.0.0-3

* Bugs: EXT-1257 EXT-1299 EXT-1149 EXT-1117 EXT-1134
* New Dev: EXT-721

3 files changed, 58 insertions, 44 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
index 0eb2c5e1be..4f501b65f3 100644
--- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater

- can_minimize="false"

- height="108"

- layout="topleft"

- name="whitelist_entry"

- width="390">

-

-  <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft"

-     left="10" name="media_label" top="20">

-        Enter a URL or URL pattern to add to the list of allowed domains

-    </text>

-

-  <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif"

-	     height="20" left="10" name="whitelist_entry"

-	     tool_tip="Enter a URL or URL pattern to White List"

-	     width="350" />

-

-  <button follows="top|left" height="20" font="SansSerifSmall" label="OK"

-     layout="topleft" left="10" name="ok_btn" bottom_delta="28" width="64" />

-  

-  <button follows="top|left" height="20" font="SansSerifSmall" label="Cancel"

-     layout="topleft" left_pad="5" name="cancel_btn" bottom_delta="0" width="64" />

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ height="108"
+ layout="topleft"
+ name="whitelist_entry"
+ width="390">
+
+  <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft"
+     left="10" name="media_label" top="20">
+        Enter a URL or URL pattern to add to the list of allowed domains
+    </text>
+
+  <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif"
+	     height="20" left="10" name="whitelist_entry"
+	     tool_tip="Enter a URL or URL pattern to White List"
+	     width="350" />
+
+  <button follows="top|left" height="20" font="SansSerifSmall" label="OK"
+     layout="topleft" left="10" name="ok_btn" bottom_delta="28" width="64" />
+  
+  <button follows="top|left" height="20" font="SansSerifSmall" label="Cancel"
+     layout="topleft" left_pad="5" name="cancel_btn" bottom_delta="0" width="64" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 8b9fe2cf77..696e0b3c33 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -60,7 +60,7 @@
          left="5"
          name="teleport_btn"
          top="0"
-         width="90" />
+         width="70" />
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -70,7 +70,7 @@
          left_pad="5"
          name="map_btn"
          top="0"
-         width="80" />
+         width="50" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -83,40 +83,54 @@
          top="0"
          width="60" />
         <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Edit"
+         layout="topleft"
+         left_pad="5"
+         name="edit_btn"
+         top="0"
+         width="50" />
+        <button
          follows="bottom|right"
          font="SansSerifSmallBold"
          height="25"
          label="▼"
          layout="topleft"
-         left_pad="5"
          name="overflow_btn"
+         right="-10"
          top="0"
          width="30" />
         <button
-         follows="bottom|left"
+         follows="bottom|right"
          font="SansSerifSmallBold"
          height="25"
-         image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
-         image_selected="widgets/SegmentedBtn_Left_Selected.png"
-         image_unselected="widgets/SegmentedBtn_Left_Off.png"
-         label="Create"
+         label="Close"
          layout="topleft"
-         left="5"
-         name="create_landmark_btn"
+         name="close_btn"
+         right="-10"
          top="0"
-         width="70" />
+         width="60" />
         <button
-         follows="bottom|left"
+         follows="bottom|right"
          font="SansSerifSmallBold"
          height="25"
-         image_disabled="widgets/ComboButton_Disabled.png"
-         image_selected="widgets/ComboButton_Selected.png"
-         image_unselected="widgets/ComboButton_Off.png"
-         label="▼"
+         label="Cancel"
+         layout="topleft"
+         name="cancel_btn"
+         right="-10"
+         top="0"
+         width="60" />
+        <button
+         follows="bottom|right"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Save"
          layout="topleft"
-         left_pad="0"
-         name="folder_menu_btn"
+         name="save_btn"
+         right="-75"
          top="0"
-         width="20" />
+         width="60" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index 824a815a99..4520768216 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -12,7 +12,7 @@
              draw_stripes="true"
              scroll_bar_bg_visible="false"
              scroll_bar_bg_color="black"
-             background_visible="false"
+             background_visible="true"
              heading_height="23"
              draw_border="false"
              draw_heading="false" />