merge

--HG--
branch : avatar-pipeline

3 files changed, 19 insertions, 30 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index d363452204..c5d6f885d3 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
+ legacy_header_height="13"
  can_resize="true"
- height="512"
+ height="646"
  layout="topleft"
  min_height="140"
  min_width="467"
@@ -11,7 +11,7 @@
  save_rect="true"
  single_instance="true"
  title="FIND"
- width="620">
+ width="670">
     <floater.string
      name="search_url">
         http://eniac21.lindenlab.com:10001/viewer
@@ -25,21 +25,20 @@
         Done
     </floater.string>
     <layout_stack
-     bottom="512"
+     bottom="641"
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
      name="stack1"
      top="20"
-     width="600">
+     width="650">
         <layout_panel
-         height="12"
          layout="topleft"
          left_delta="0"
-         name="external_controls"
          top_delta="0"
+         name="browser_layout"
          user_resize="false"
-         width="570">
+         width="650">
             <web_browser
              bottom="-10"
              follows="left|right|top|bottom"
@@ -48,7 +47,8 @@
              name="browser"
              top="0"
              start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
-             width="570" />
+             height="600"
+             width="650" />
             <text
              follows="bottom|left"
              height="16"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index e5592c3c57..4e6a07d020 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -111,15 +111,4 @@
 			 function="Inventory.GearDefault.Enable"
 			 parameter="find_links" />
         </menu_item_call>
-    <menu_item_call 
-         label="Regenerate Link"
-         layout="topleft"
-         name="Regenerate Link">
-            <on_click
-             function="Inventory.GearDefault.Custom.Action"
-             parameter="regenerate_link" />
-            <on_enable
-			 function="Inventory.GearDefault.Enable"
-			 parameter="regenerate_link" />
-        </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 0bc2b44ad5..efe26d3887 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -75,16 +75,6 @@
      tool_tip="[SECOND_LIFE] Last Name"
      top_delta="0"
      width="135" />
-      <combo_box
-     allow_text_entry="true"
-     font="SansSerifSmall"
-     follows="left|bottom"
-     height="23"
-     layout="topleft"
-     top="60"
-     name="server_combo"
-     width="135"
-     visible="false" />
      <text
      follows="left|bottom"
      font="SansSerifSmall"
@@ -161,6 +151,16 @@
          name="Typeregionname"
          value="" />
     </combo_box>
+    <combo_box
+     allow_text_entry="true"
+     font="SansSerifSmall"
+     follows="right|bottom"
+     height="23"
+     layout="topleft"
+     top_pad="2"
+     name="server_combo"
+     width="135"
+     visible="false" />
     <text
      follows="right|bottom"
      font="SansSerifSmall"