Merge with head

2 files changed, 3 insertions, 15 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 3d1bc0edae..1d31fbd6dc 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -8,18 +8,7 @@
  help_topic="floater_test_textbox"
  translate="false"
  width="800">
-    <text
-     type="string"
-     length="1"
-     height="90"
-     layout="topleft"
-     left="10"
-     valign="bottom"
-     clip="true"
-     top_pad="30"
-     width="300">
-___</text>
-  <!--<text
+ <text
     clip_partial="true"
     top_pad="10"
     left="10"
@@ -150,7 +139,7 @@ ___</text>
     The 华文细黑 brown fox ヒラキjumped over the lazy dog.
   </text>
   
---><!-- next column --><!--
+<!-- next column -->
   <text_editor
  height="50"
  follows="top|left|bottom"
@@ -247,5 +236,5 @@ with
 multiple lines
 and too many lines
 to actually fit
-  </text>-->
+  </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d6d8b2a83e..1c882bb099 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -80,7 +80,6 @@
      top="16"
      width="288" />
     <recent_inventory_panel
-     accepts_drag_and_drop="false"
      bg_opaque_color="DkGray2"
      bg_alpha_color="DkGray2"
      background_visible="true"