Ported slviewer-0-v12300-ReinstateOldSearchTabs.patch from the Hippo Viewer (opensim currently uses the old search all)

1 files changed, 105 insertions, 62 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index a600c86..039c4f8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -1,12 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" height="590" min_height="590" min_width="780"
-     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
+     name="directory" rect_control="FloaterFindRect2" title="Search"
      width="780">
         <tab_container bottom="-590" follows="left|top|right|bottom" height="570" left="0"
              mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
                 <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
-                     label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
+                     label="All" left="1" mouse_opaque="false" name="find_all_old_panel" width="778">
+                        <string name="searching_text">
+                                Searching...
+                        </string>
+                        <string name="not_found_text">
+                                None Found.
+                        </string>
+                        <button bottom="-553" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
+                             mouse_opaque="true" name="&lt; Prev" width="60" />
+                        <button bottom="-553" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" width="60" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+                             name="find" v_pad="0" width="50">
+                                Find:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
+                             name="Search" width="70" />
+                        <check_box bottom="-22" control_name="ShowPGSearchAll" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="PG content" left_delta="78" mouse_opaque="true"
+                             name="incpg" width="156" />
+                        <check_box bottom="-22" control_name="ShowMatureSearchAll" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Mature content" left_delta="100" mouse_opaque="true"
+                             name="incmature" width="156" />
+                        <check_box bottom="-22" control_name="ShowAdultSearchAll" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Adult content" left_delta="120" mouse_opaque="true"
+                             name="incadult" width="156" />
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
+                             draw_heading="false" fg_disable_color="1, 1, 1, 1"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="1" width="339">
+                                <column label="" name="icon" width="24" />
+                                <column label="Name" name="name" width="235" />
+                                <column label="Price" name="price" width="90" />
+                                <column label="Time (PT)" name="date" width="90" />
+                                <column label="Time" name="time" width="-1" />
+                                <column label="Traffic" name="dwell" width="90" />
+                                <column label="Area" name="area" width="90" />
+                                <column label="[CURRENCY]/sq.m" name="per_meter" width="90" />
+                                <column label="Online" name="online" width="90" />
+                                <column label="Members" name="members" width="90" />
+                        </scroll_list>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                </panel>
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
+                     label="All (web)" left="1" mouse_opaque="false" name="find_all_panel" width="778">
                         <string name="searching_text">
                                 Searching...
                         </string>
@@ -616,72 +674,57 @@ To buy direct, visit the land and click on the place name in the title bar.
                      label="Groups" left="1" mouse_opaque="false"
                      name="groups_panel"
                      width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
+                        <string name="searching_text">
+                                Searching...
+                        </string>
+                        <string name="not_found_text">
+                                None Found.
+                        </string>
+                        <button bottom="-553" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                              h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
                              name="find" v_pad="0" width="50">
                                 Find:
                         </text>
-      <line_editor bevel_style="in"
-                                                border_style="line"
-                                                border_thickness="1"
-                                                bottom="-24"
-                                                enabled="true"
-                                                follows="top|left|right"
-                                                font="SansSerif"
-                                                handle_edit_keys_directly="false"
-                                                commit_on_focus_lost="false"
-                                                height="18"
-                                                hidden="false"
-                                                label="Search"
-                                                left_delta="56"
-                                                width="160"
-                                                max_length="254"
-                                                mouse_opaque="true"
-                                                name="search_editor"
-                                                select_all_on_focus_received="false"
-                                                select_on_focus="false"
-                                                tab_group="1"
-                                                tool_tip="Search Second Life" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-                             left="230" name="back_btn" width="70" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-                             label="Forward" left="304" name="forward_btn" width="70" />
-                        <button bottom="-48" follows="top|right" font="SansSerif" height="20"
-                             label="Search" left="121" name="search_btn" width="95" />
-          <check_box bottom="-22" control_name="ShowPGGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="true"
-                     label="PG content" left="420" mouse_opaque="true"
-                     name="incpg" width="156" />
-          <check_box bottom="-40" control_name="ShowMatureGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="true"
-                     label="Mature content" left="420" mouse_opaque="true"
-                     name="incmature" width="156" />
-          <check_box bottom="-58" control_name="ShowAdultGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="false"
-                     label="Adult content" left="420" mouse_opaque="true"
-                     name="incadult" width="156" />
-      <web_browser name="groups_browser"
-                                bottom="25"
-                                follows="top|left|bottom|right"
-                                font="SansSerifSmall"
-                                left="10"
-                                right="-10"
-                                top="-60" />
-      <text bottom="5"
-                                follows="bottom|left"
-                                halign="left"
-                                left="10"
-                                width="150"
-                                name="status_text"
-                                height="16" />
-      <string name="loading_text">Loading...</string>
-      <string name="done_text">Done</string>
-      <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index_groups.php?"</string>
-    </panel>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             max_length="63" mouse_opaque="true" name="name" width="200" />
+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
+                             name="Search" width="70" />
+                        <check_box bottom="-46" control_name="ShowPGGroups" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="PG content" left="4" mouse_opaque="true"
+                             name="incpg" width="204" />
+                        <check_box bottom="-46" control_name="ShowMatureGroups" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="Mature content" left_delta="90" mouse_opaque="true"
+                             name="incmature" width="204" />
+                        <check_box bottom="-46" control_name="ShowAdultGroups" follows="left|top"
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Adult content" left_delta="110" mouse_opaque="true"
+                             name="incadult" width="204" />
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
+                             draw_heading="true"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="2" width="339">
+                                <column label="" name="icon" sort="score" sort_ascending="false" width="24" />
+                                <column label="" name="type" width="-1" />
+                                <column dynamicwidth="true" label="Name" name="name" />
+                                <column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
+                                <column label="" name="score" width="-1" />
+                        </scroll_list>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                </panel>
         </tab_container>
         <panel bottom="-580" follows="right|top" height="490" left="340"
              name="classified_details_panel" width="440" />