Merge branch 'develop' into rider/privileged_land

5 files changed, 44 insertions, 3 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_marketplace.xml b/indra/newview/skins/default/xui/en/floater_marketplace.xml
index 99fb3a1ad8..40bf674d2d 100644
--- a/indra/newview/skins/default/xui/en/floater_marketplace.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace.xml
@@ -169,7 +169,7 @@
         follows="all"
         layout="topleft"
         left="0"
-        name="marketplace_contents"
+        name="webbrowser"
         top="0"/>
     </layout_panel>
     <layout_panel name="status_bar" 
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 43c4aa1b9d..8891ebcd87 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -170,7 +170,7 @@
         layout="topleft"
         left="0"
         trusted_content="true"
-        name="search_contents"
+        name="webbrowser"
         top="0"/>
     </layout_panel>
     <layout_panel name="status_bar" 
diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
index 4211d624ac..0d75685223 100644
--- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
@@ -155,4 +155,36 @@
          name="item3"
          value="tx" />
     </combo_box>
+    <text
+     type="string"
+     length="1"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     top_pad="24"
+     width="200">
+        Multiple columns:
+    </text>
+    <combo_box
+      name="multi_column_combo"
+      layout="topleft"
+      height="20"
+      width="150"
+      left_delta="0"
+      top_pad="4">
+        <combo_item  name="combo_item1" value="0">
+        <column width="40"  name="label"    label="|Abc|" />
+        <column name="longtext" label="Match full text" />
+        </combo_item>
+
+        <combo_item  name="combo_item2" value="1">
+        <column name="label"    label="*Abc*" />
+        <column name="longtext" label="Match substring" />
+        </combo_item>
+
+        <combo_item  name="combo_item3" value="2">
+        <column name="label"    label="/ *. /" />
+        <column name="longtext" label="Match regular expression" />
+        </combo_item>
+    </combo_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 7290cbb5c6..74bc7736f9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -86,6 +86,15 @@ Hover your mouse over the options for more help.
      name="btn_join"
      visible="true"
      width="120" />
+    <button
+     follows="left|top"
+     left_pad="6"
+     top_delta="0"
+     height="23"
+     label="Activate"
+     name="btn_activate"
+     visible="true"
+     width="120" />
     </panel>
     <text_editor
      type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 3a5a8cbfec..2fc859f43e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -214,7 +214,7 @@
    left_pad="10"
    top_delta="-6"
    name="mouse_warp_combo"
-   tooltip="Controls warping of the mouse to the center of the screen during alt-zoom and mouse look."
+   tool_tip="Controls warping of the mouse to the center of the screen during alt-zoom and mouse look."
    width="200">
     <combo_box.item
      label="Automatic"