From d294d568d1c97650bba4c388c8a7eab5a5c49c94 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 21 Oct 2025 22:05:07 +0300
Subject: #4411 WIP initial restoring of Legacy Search

---
 .../skins/default/textures/icon_auction.tga        | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/icon_event.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_event_adult.tga    | Bin 0 -> 648 bytes
 .../skins/default/textures/icon_event_mature.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/icon_place.tga  | Bin 0 -> 1068 bytes
 indra/newview/skins/default/textures/textures.xml  |   6 +
 .../skins/default/xui/en/floater_directory.xml     | 139 ++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   8 +-
 .../skins/default/xui/en/panel_dir_classified.xml  | 197 ++++++++++++++
 .../skins/default/xui/en/panel_dir_events.xml      | 286 +++++++++++++++++++++
 .../skins/default/xui/en/panel_dir_groups.xml      | 122 +++++++++
 .../skins/default/xui/en/panel_dir_land.xml        | 216 ++++++++++++++++
 .../skins/default/xui/en/panel_dir_people.xml      | 114 ++++++++
 .../skins/default/xui/en/panel_dir_places.xml      | 204 +++++++++++++++
 .../skins/default/xui/en/panel_event_info.xml      | 221 ++++++++++++++++
 15 files changed, 1512 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/icon_auction.tga
 create mode 100644 indra/newview/skins/default/textures/icon_event.tga
 create mode 100644 indra/newview/skins/default/textures/icon_event_adult.tga
 create mode 100644 indra/newview/skins/default/textures/icon_event_mature.tga
 create mode 100644 indra/newview/skins/default/textures/icon_place.tga
 create mode 100644 indra/newview/skins/default/xui/en/floater_directory.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_dir_classified.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_dir_events.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_dir_groups.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_dir_land.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_dir_people.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_dir_places.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_event_info.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icon_auction.tga b/indra/newview/skins/default/textures/icon_auction.tga
new file mode 100644
index 0000000000..d121833b47
Binary files /dev/null and b/indra/newview/skins/default/textures/icon_auction.tga differ
diff --git a/indra/newview/skins/default/textures/icon_event.tga b/indra/newview/skins/default/textures/icon_event.tga
new file mode 100644
index 0000000000..7805dbce60
Binary files /dev/null and b/indra/newview/skins/default/textures/icon_event.tga differ
diff --git a/indra/newview/skins/default/textures/icon_event_adult.tga b/indra/newview/skins/default/textures/icon_event_adult.tga
new file mode 100644
index 0000000000..c344fb1e78
Binary files /dev/null and b/indra/newview/skins/default/textures/icon_event_adult.tga differ
diff --git a/indra/newview/skins/default/textures/icon_event_mature.tga b/indra/newview/skins/default/textures/icon_event_mature.tga
new file mode 100644
index 0000000000..61c879bc92
Binary files /dev/null and b/indra/newview/skins/default/textures/icon_event_mature.tga differ
diff --git a/indra/newview/skins/default/textures/icon_place.tga b/indra/newview/skins/default/textures/icon_place.tga
new file mode 100644
index 0000000000..2170c98499
Binary files /dev/null and b/indra/newview/skins/default/textures/icon_place.tga differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d650e7e791..ff5737ab49 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -837,8 +837,14 @@ with the same filename but different name
   <texture name="icon_avatar_online.tga" />
   <texture name="icon_diurnal.tga" />
   <texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" />
+  <texture name="icon_auction.tga"/>
+  <texture name="icon_place.tga"/>
   <texture name="icon_top_pick.tga" />
 
+  <texture name="icon_event.tga"/>
+  <texture name="icon_event_adult.tga"/>
+  <texture name="icon_event_mature.tga" />
+
   <texture name="lag_status_critical.tga" />
   <texture name="lag_status_good.tga" />
   <texture name="lag_status_warning.tga" />
diff --git a/indra/newview/skins/default/xui/en/floater_directory.xml b/indra/newview/skins/default/xui/en/floater_directory.xml
new file mode 100644
index 0000000000..143bfdc0d9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_directory.xml
@@ -0,0 +1,139 @@
+<?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="570"
+ min_height="570"
+ width="780"
+ min_width="780"
+ name="directory"
+ title="Search">
+    <tab_container
+     top="0"
+     left="0"
+     follows="left|top|right|bottom"
+     height="550"
+     width="780"
+     mouse_opaque="false"
+     name="Directory Tabs"
+     tab_position="top">
+        <panel
+         border="false"
+         label="People"
+         filename="panel_dir_people.xml"
+         class="panel_dir_people"
+         name="panel_dir_people"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Groups"
+         filename="panel_dir_groups.xml"
+         class="panel_dir_groups"
+         name="panel_dir_groups"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Places"
+         filename="panel_dir_places.xml"
+         class="panel_dir_places"
+         name="panel_dir_places"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Land Sales"
+         filename="panel_dir_land.xml"
+         class="panel_dir_land"
+         name="panel_dir_land"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Events"
+         filename="panel_dir_events.xml"
+         class="panel_dir_events"
+         name="panel_dir_events"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+        <panel
+         border="false"
+         label="Classifieds"
+         filename="panel_dir_classified.xml"
+         class="panel_dir_classified"
+         name="panel_dir_classified"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
+</tab_container>
+    <panel
+     top="65"
+     follows="right|top"
+     height="486"
+     left="345"
+     visible="false"
+     name="panel_profile_secondlife"
+     class="panel_profile_secondlife"
+     filename="panel_profile_secondlife.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="480"
+     left="345"
+     visible="false"
+     name="panel_group_info_sidetray"
+     class="panel_group_info_sidetray"
+     filename="panel_group_info_sidetray.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="480"
+     left="345"
+     visible="false"
+     name="panel_places"
+     class="panel_places"
+     filename="panel_places.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="480"
+     left="345"
+     visible="false"
+     name="panel_classified_info"
+     class="panel_classified_info"
+     filename="panel_classified_info.xml"
+     width="425" />
+    <panel
+     top="70"
+     follows="bottom|right|top"
+     height="480"
+     left="345"
+     visible="false"
+     name="panel_event_info"
+     class="panel_event_info"
+     filename="panel_event_info.xml"
+     width="425" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 081e5be014..08521ebe81 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -125,7 +125,6 @@
       </menu_item_call>
 
       <menu_item_separator/>
-
       <menu_item_call
          label="Preferences..."
          name="Preferences"
@@ -688,6 +687,13 @@
             <menu_item_check.on_click
              function="Avatar.ToggleSearch"/>
             </menu_item_check>
+        <menu_item_call
+         label="Legacy Search..."
+         name="LegacySearch">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="legacy_search" />
+        </menu_item_call>
         <menu_item_separator/>
         <menu_item_call
          label="Teleport home"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_classified.xml b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
new file mode 100644
index 0000000000..8478a513ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
@@ -0,0 +1,197 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Classifieds"
+ left="1"
+ left_delta="68"
+ mouse_opaque="false"
+ name="panel_dir_classified"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     v_pad="0"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     top_delta="0"
+     left="465"
+     layout="topleft"
+     follows="right|top"
+     height="18"
+     max_chars="20"
+     mouse_opaque="true"
+     name="Category"
+     width="128">
+        <combo_item name="AnyCategory" value="0">
+            Any Category
+        </combo_item>
+        <combo_item name="Shopping" value="1">
+            Shopping
+        </combo_item>
+        <combo_item name="LandRental" value="2">
+            Land Rental
+        </combo_item>
+        <combo_item name="PropertyRental" value="3">
+            Property Rental
+        </combo_item>
+        <combo_item name="SpecialAttraction" value="4">
+            Special Attraction
+        </combo_item>
+        <combo_item name="NewProducts" value="5">
+            New Products
+        </combo_item>
+        <combo_item name="Employment" value="6">
+            Employment
+        </combo_item>
+        <combo_item name="Wanted" value="7">
+            Wanted
+        </combo_item>
+        <combo_item name="Service" value="8">
+            Service
+        </combo_item>
+        <combo_item name="Personal" value="9">
+            Personal
+        </combo_item>
+    </combo_box>
+    <check_box
+     left_pad="20"
+     control_name="ShowPGClassifieds"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="PG"
+     mouse_opaque="true"
+     name="incpg"
+     width="35" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowMatureClassifieds"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Mature"
+     mouse_opaque="true"
+     name="incmature"
+     width="56" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowAdultClassifieds"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label="Adult"
+     mouse_opaque="true"
+     name="incadult"
+     width="50" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="2"
+     follows="left|right|top"
+     layout="topleft"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="660" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="95" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" width="225" />
+        <column label="Price" name="price" width="55" />
+    </scroll_list>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     follows="left|bottom"
+     font="SansSerifSmall"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="4"
+     mouse_opaque="true"
+     name="result_text"
+     v_pad="0"
+     width="80" />
+    <button
+     bottom="-533"
+     follows="right|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="right|bottom"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&lt; Prev"
+     label_selected="&lt; Prev"
+     mouse_opaque="true"
+     name="&lt; Prev"
+     right="258"
+     width="80" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_events.xml b/indra/newview/skins/default/xui/en/panel_dir_events.xml
new file mode 100644
index 0000000000..6f21cc06c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -0,0 +1,286 @@
+<panel
+ border="true"
+ top="30"
+ default_tab_group="1"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Events"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_events"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     top_delta="0"
+     left="465"
+     layout="topleft"
+     follows="right|top"
+     height="18"
+     max_chars="20"
+     mouse_opaque="true"
+     name="category combo"
+     width="128">
+        <combo_item name="All" value="0">
+            Any Category
+        </combo_item>
+        <combo_item name="Discussion" value="18">
+            Discussion
+        </combo_item>
+        <combo_item name="Sports" value="19">
+            Sports
+        </combo_item>
+        <combo_item name="LiveMusic" value="20">
+            Live Music
+        </combo_item>
+        <combo_item name="Commercial" value="22">
+            Commercial
+        </combo_item>
+        <combo_item name="Nightlife/Entertainment" value="23">
+            Nightlife/Entertainment
+        </combo_item>
+        <combo_item name="Games/Contests" value="24">
+            Games/Contests
+        </combo_item>
+        <combo_item name="Pageants" value="25">
+            Pageants
+        </combo_item>
+        <combo_item name="Education" value="26">
+            Education
+        </combo_item>
+        <combo_item name="ArtsandCulture" value="27">
+            Arts and Culture
+        </combo_item>
+        <combo_item name="Charity/SupportGroups" value="28">
+            Charity/Support Groups
+        </combo_item>
+        <combo_item name="Miscellaneous" value="29">
+            Miscellaneous
+        </combo_item>
+    </combo_box>
+    <check_box
+     left_pad="20"
+     control_name="ShowPGEvents"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="PG"
+     mouse_opaque="true"
+     name="incpg"
+     width="35" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowMatureEvents"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Mature"
+     mouse_opaque="true"
+     name="incmature"
+     width="56" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowAdultEvents"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label="Adult"
+     mouse_opaque="true"
+     name="incadult"
+     width="50" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="2"
+     follows="left|right|top"
+     layout="topleft"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="event_search_text"
+     width="660" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="95" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column dynamicwidth="true" label="Name" name="name" />
+        <column label="Time (PT)" name="date" sort="time" width="106" />
+        <column label="" name="event_id" width="-1" />
+        <column label="Time" name="time" 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="80" />
+    <button
+     bottom="-533"
+     follows="right|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="right|bottom"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&lt; Prev"
+     label_selected="&lt; Prev"
+     mouse_opaque="true"
+     name="&lt; Prev"
+     right="258"
+     width="80" />
+    <radio_group
+     top="5"
+     draw_border="false"
+     follows="top|left"
+     layout="topleft"
+     height="16"
+     left="128"
+     mouse_opaque="true"
+     name="date_mode"
+     width="200">
+        <radio_item
+         layout="topleft"
+         left="3"
+         top="0"
+         follows="left|top"
+         height="20"
+         mouse_opaque="true"
+         name="current"
+         width="170"
+         label="In-Progress &amp; Upcoming"/>
+        <radio_item
+         layout="topleft"
+         follows="left|top"
+         height="20"
+         top_delta="0"
+         left_delta="151"
+         mouse_opaque="true"
+         name="date"
+         width="56"
+         label="Date"/>
+    </radio_group>
+    <button
+     top="6"
+     left_pad="15"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&lt;&lt;"
+     label_selected="&lt;&lt;"
+     left_delta="54"
+     mouse_opaque="true"
+     name="&lt;&lt;"
+     tool_tip="Go back a day"
+     width="20" />
+    <text
+     top="8"
+     bg_visible="false"
+     border_drop_shadow_visible="false"
+     border_visible="false"
+     left_pad="1"
+     layout="topleft"
+     drop_shadow_visible="true"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="center"
+     height="14"
+     mouse_opaque="true"
+     name="date_text"
+     v_pad="0"
+     width="48">
+        6/6
+    </text>
+    <button
+     top="6"
+     left_pad="1"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&gt;&gt;"
+     label_selected="&gt;&gt;"
+     left_delta="50"
+     mouse_opaque="true"
+     name="&gt;&gt;"
+     tool_tip="Go forward a day"
+     width="20" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_groups.xml b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
new file mode 100644
index 0000000000..10c90b2964
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
@@ -0,0 +1,122 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Groups"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_groups"
+ width="778">
+    <button
+     bottom="-533"
+     follows="left|bottom"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Next &gt;"
+     label_selected="Next &gt;"
+     right="344"
+     mouse_opaque="true"
+     name="Next &gt;"
+     width="80" />
+    <button
+     bottom_delta="0"
+     follows="left|bottom"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&lt; Prev"
+     right="258"
+     mouse_opaque="true"
+     name="&lt; Prev"
+     width="80" />
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     v_pad="0"
+     width="150">
+        Enter search terms:
+    </text>
+    <check_box
+     top_delta="0"
+     control_name="ShowMatureGroups"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label="Include Mature groups"
+     left="465"
+     mouse_opaque="true"
+     name="incmature"
+     width="100" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="5"
+     follows="left|right|top"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="660" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="95" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" sort="score" sort_ascending="false" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" dynamicwidth="true" />
+        <column label="Members" name="members" width="100" halign="left" sort_ascending="false" />
+        <column label="" name="score" width="-1"/>
+    </scroll_list>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     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>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_land.xml b/indra/newview/skins/default/xui/en/panel_dir_land.xml
new file mode 100644
index 0000000000..d82ce7f767
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_land.xml
@@ -0,0 +1,216 @@
+<panel border="true" top="30" follows="left|top|right|bottom" height="533"
+     label="Land Sales" left="1" mouse_opaque="false" name="panel_dir_land"
+     width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <string name="land_help_text">
+        Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
+        To buy direct, visit the land and click on the place name in the title bar.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     follows="top|right"
+     layout="topleft"
+     height="18"
+     top_delta="0"
+     left="465"
+     max_chars="20"
+     mouse_opaque="true"
+     name="type"
+     width="128">
+        <combo_item name="AllTypes" value="All Types">
+            All Types
+        </combo_item>
+        <combo_item name="Auction" value="Auction">
+            Auction
+        </combo_item>
+        <combo_item name="MainlandSales" value="Mainland Sales">
+            For Sale - Mainland
+        </combo_item>
+        <combo_item name="EstateSales" value="Estate Sales">
+            For Sale - Estate
+        </combo_item>
+    </combo_box>
+    <check_box
+     left_pad="20"
+     control_name="ShowPGLand"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="PG"
+     mouse_opaque="true"
+     name="incpg"
+     width="35" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowMatureLand"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Mature"
+     mouse_opaque="true"
+     name="incmature"
+     width="56" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowAdultLand"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label="Adult"
+     mouse_opaque="true"
+     name="incadult"
+     width="50" />
+    <check_box
+     top_pad="2"
+     layout="topleft"
+     control_name="FindLandPrice"
+     follows="left|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Price &#8804; "
+     left="5"
+     mouse_opaque="true"
+     name="pricecheck"
+     width="60" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     left_pad="1"
+     max_length="10"
+     mouse_opaque="true"
+     name="priceedit"
+     width="50" />
+    <text
+     bg_visible="false"
+     border_drop_shadow_visible="false"
+     border_visible="false"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     halign="left"
+     height="16"
+     left_pad="3"
+     mouse_opaque="true"
+     name="pricecheck_symbol"
+     width="15">
+        L$
+    </text>
+    <check_box
+     control_name="FindLandArea"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Area &#8805; "
+     left_pad="10"
+     mouse_opaque="true"
+     name="areacheck"
+     width="60" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     left_pad="1"
+     max_length="10"
+     mouse_opaque="true"
+     name="areaedit"
+     width="50" />
+    <text
+     bg_visible="false"
+     border_drop_shadow_visible="false"
+     border_visible="false"
+     follows="left|top"
+     layout="topleft"
+     left_pad="3"
+     font="SansSerifSmall"
+     halign="left"
+     height="16"
+     mouse_opaque="true"
+     name="areacheck_symbol"
+     width="15">
+        m²
+    </text>
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="15"
+     mouse_opaque="true"
+     name="Search"
+     width="95" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column dynamicwidth="true" label="Name" name="name" />
+        <column label="Type" name="landtype" width="50" />
+        <column label="L$ Price" name="price" width="65" />
+        <column label="Area" name="area" width="50" />
+        <column label="L$/m²" name="per_meter" width="65" />
+    </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" />
+    <button bottom="-533" follows="right|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="right|bottom" font="SansSerif" halign="center"
+         height="20" label="&lt; Prev" label_selected="&lt; Prev"
+         mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_people.xml b/indra/newview/skins/default/xui/en/panel_dir_people.xml
new file mode 100644
index 0000000000..5b9fc68f33
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_people.xml
@@ -0,0 +1,114 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="People"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_people"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="5"
+     follows="left|right|top"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="660" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     top_delta="0"
+     left_pad="5"
+     height="20"
+     label="Search"
+     mouse_opaque="true"
+     name="Search"
+     width="95" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" width="274" />
+    </scroll_list>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     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" />
+    <button
+     bottom="-533"
+     follows="left|bottom"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Next &gt;"
+     label_selected="Next &gt;"
+     mouse_opaque="true"
+     name="Next &gt;"
+     right="330"
+     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="244"
+     width="80" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_places.xml b/indra/newview/skins/default/xui/en/panel_dir_places.xml
new file mode 100644
index 0000000000..a28a53c12c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_places.xml
@@ -0,0 +1,204 @@
+<panel
+ border="true"
+ top="30"
+ follows="left|top|right|bottom"
+ height="533"
+ label="Places"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_places"
+ width="778">
+    <string name="searching_text">
+        Searching...
+    </string>
+    <string name="not_found_text">
+        None Found.
+    </string>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     top="8"
+     layout="topleft"
+     follows="left|top"
+     font="SansSerif"
+     h_pad="0"
+     halign="left"
+     height="16"
+     left="5"
+     mouse_opaque="true"
+     name="find"
+     width="150">
+        Enter search terms:
+    </text>
+    <combo_box
+     allow_text_entry="false"
+     enabled="false"
+     follows="right|top"
+     layout="topleft"
+     height="18"
+     top_delta="0"
+     left="465"
+     max_chars="20"
+     mouse_opaque="true"
+     name="Category"
+     width="128"
+     visible="false">
+        <combo_item name="AnyCategory" value="any">
+            Any Category
+        </combo_item>
+        <combo_item name="LindenLocation" value="linden">
+            Linden Location
+        </combo_item>
+        <combo_item name="Arts&amp;Culture" value="arts">
+            Arts &amp; Culture
+        </combo_item>
+        <combo_item name="Business" value="store">
+            Business
+        </combo_item>
+        <combo_item name="Educational" value="educational">
+            Educational
+        </combo_item>
+        <combo_item name="Gaming" value="game">
+            Gaming
+        </combo_item>
+        <combo_item name="Hangout" value="gather">
+            Hangout
+        </combo_item>
+        <combo_item name="NewcomerFriendly" value="newcomer">
+            Newcomer Friendly
+        </combo_item>
+        <combo_item name="Parks&amp;Nature" value="park">
+            Parks &amp; Nature
+        </combo_item>
+        <combo_item name="Residential" value="home">
+            Residential
+        </combo_item>
+        <combo_item name="Shopping" value="shopping">
+            Shopping
+        </combo_item>
+        <combo_item name="Adult" value="adult">
+            Adult
+        </combo_item>
+        <combo_item name="Other" value="other">
+            Other
+        </combo_item>
+    </combo_box>
+    <check_box
+     left_pad="20"
+     control_name="ShowPGSims"
+     follows="right|top"
+     layout="topleft"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="PG"
+     mouse_opaque="true"
+     name="incpg"
+     width="35" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowMatureSims"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="true"
+     label="Mature"
+     mouse_opaque="true"
+     name="incmature"
+     width="56" />
+    <check_box
+     left_pad="5"
+     layout="topleft"
+     control_name="ShowAdultSims"
+     follows="right|top"
+     font="SansSerifSmall"
+     height="16"
+     initial_value="false"
+     label="Adult"
+     mouse_opaque="true"
+     name="incadult"
+     width="50" />
+    <line_editor
+     bevel_style="in"
+     border_style="line"
+     border_thickness="1"
+     top_pad="2"
+     follows="left|right|top"
+     layout="topleft"
+     font="SansSerif"
+     height="18"
+     left="5"
+     max_length="63"
+     mouse_opaque="true"
+     name="name"
+     width="660" />
+    <button
+     follows="right|top"
+     layout="topleft"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Search"
+     top_delta="0"
+     left_pad="5"
+     mouse_opaque="true"
+     name="Search"
+     width="95" />
+    <scroll_list
+     background_visible="true"
+     layout="topleft"
+     top_pad="3"
+     column_padding="0"
+     draw_border="true"
+     draw_heading="true"
+     follows="left|top|right|bottom"
+     height="450"
+     left="5"
+     mouse_opaque="true"
+     multi_select="false"
+     name="results"
+     search_column="2"
+     width="336">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column dynamicwidth="true" label="Name" name="name" />
+        <column label="Traffic" name="dwell" width="75" />
+    </scroll_list>
+    <text
+     bg_visible="false"
+     border_visible="false"
+     bottom_delta="-20"
+     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" />
+    <button
+     bottom="-533"
+     follows="left|bottom"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="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"
+     mouse_opaque="true"
+     name="&lt; Prev"
+     right="258"
+     width="80" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_event_info.xml b/indra/newview/skins/default/xui/en/panel_event_info.xml
new file mode 100644
index 0000000000..138ee587bb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_event_info.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="false"
+ can_close="true"
+ can_minimize="true"
+ can_resize="false"
+ follows="all"
+ height="570"
+ left="0"
+ top="0"
+ name="panel_event_info"
+ title="Event"
+ width="330">
+    <string name="none">
+        none
+    </string>
+    <string name="notify">
+        Notify
+    </string>
+    <string name="dont_notify">
+        Don&apos;t Notify
+    </string>
+    <text
+     top="4"
+     layout="topleft"
+     follows="top|left"
+     font="SansSerif"
+     left="20"
+     name="event_name_label">
+        Name:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_name">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_category_label">
+        Type:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+    name="event_category">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_mature_label">
+        Mature Content:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_mature_yes"
+     visible="false">
+        Yes
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_mature_no"
+     visible="false">
+        No
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_date_label">
+        Date:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_date">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_duration_label">
+        Event Duration:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_duration">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_runby_label">
+        Run By:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_runby">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_location_label">
+        Location:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_location">
+        (none)
+    </text>
+    <text
+     top_pad="10"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_cover_label">
+        Cover Charge:
+    </text>
+    <text
+     top_delta="0"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="120"
+     name="event_cover">
+        (none)
+    </text>
+    <text
+     top_pad="20"
+     follows="top|left"
+     layout="topleft"
+     font="SansSerif"
+     left="20"
+     name="event_desc_label">
+        Description:
+    </text>
+    <text_editor
+     top_pad="10"
+     follows="left|top"
+     layout="topleft"
+     height="220"
+     left="20"
+     enabled="false"
+     max_length="1024"
+     name="event_desc"
+     width="400" />
+    <button
+     bottom_delta="-24"
+     follows="left|top"
+     height="20"
+     label="Teleport"
+     left="20"
+     name="teleport_btn"
+     width="140" />
+    <button
+     bottom_delta="0"
+     follows="left|top"
+     height="20"
+     label="Show on Map"
+     left="165"
+     name="map_btn"
+     width="140" />
+    <button
+     bottom_delta="-20"
+     follows="left|top"
+     height="20"
+     label="Notify"
+     left="20"
+     name="notify_btn"
+     width="140" />
+</panel>
-- 
cgit v1.3


From b0c975724510b2685fc08cee060da670361c93c9 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 23 Oct 2025 01:28:13 +0300
Subject: #4411 WIP add Web tab to legacy Search

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llfloaterdirectory.cpp               |   2 +
 indra/newview/llpaneldirbrowser.cpp                |  49 +++----
 indra/newview/llpaneldirbrowser.h                  |  51 +++----
 indra/newview/llpaneldirplaces.cpp                 |  15 ---
 indra/newview/llpaneldirweb.cpp                    | 149 +++++++++++++++++++++
 indra/newview/llpaneldirweb.h                      |  63 +++++++++
 indra/newview/llpaneleventinfo.cpp                 |  26 +---
 .../skins/default/xui/en/floater_directory.xml     |  11 ++
 .../newview/skins/default/xui/en/panel_dir_web.xml |  76 +++++++++++
 .../skins/default/xui/en/panel_event_info.xml      |  30 ++---
 11 files changed, 359 insertions(+), 115 deletions(-)
 create mode 100644 indra/newview/llpaneldirweb.cpp
 create mode 100644 indra/newview/llpaneldirweb.h
 create mode 100644 indra/newview/skins/default/xui/en/panel_dir_web.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index be9df8a6df..d56ac36190 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -449,6 +449,7 @@ set(viewer_SOURCE_FILES
     llpaneldirland.cpp
     llpaneldirpeople.cpp
     llpaneldirplaces.cpp
+    llpaneldirweb.cpp
     llpaneleditsky.cpp
     llpaneleditwater.cpp
     llpaneleditwearable.cpp
@@ -1125,6 +1126,7 @@ set(viewer_HEADER_FILES
     llpaneldirland.h
     llpaneldirpeople.h
     llpaneldirplaces.h
+    llpaneldirweb.h
     llpaneleditsky.h
     llpaneleditwater.h
     llpaneleditwearable.h
diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp
index 04a6a45af3..35f0f7ef5a 100644
--- a/indra/newview/llfloaterdirectory.cpp
+++ b/indra/newview/llfloaterdirectory.cpp
@@ -35,6 +35,7 @@
 #include "llpaneldirgroups.h"
 #include "llpaneldirplaces.h"
 #include "llpaneldirclassified.h"
+#include "llpaneldirweb.h"
 #include "llscrollbar.h"
 #include "llviewercontrol.h"
 #include "llpanelavatar.h"
@@ -75,6 +76,7 @@ bool LLFloaterDirectory::postBuild()
             panel_tab->setFloaterDirectory(this);
         }
     }
+    findChild<LLPanelDirWeb>("panel_dir_web")->setFloaterDirectory(this);
 
     mPanelAvatarp = findChild<LLPanelProfileSecondLife>("panel_profile_secondlife");
     mPanelAvatarp->setAllowEdit(false);
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 2ef7bb122d..2391ced6ed 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -1,32 +1,26 @@
-/** 
+/**
  * @file llpaneldirbrowser.cpp
- * @brief LLPanelDirBrowser class implementation
+ * @brief Base class for panels in the legacy Search directory.
  *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2025&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * Copyright (C) 2025, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -41,7 +35,6 @@
 // linden library includes
 #include "lldir.h"
 #include "lleventflags.h"
-#include "llfontgl.h"
 #include "llqueryflags.h"
 #include "message.h"
 
@@ -61,9 +54,7 @@
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
 #include "lltrans.h"
-#include "lluiconstants.h"
 #include "llviewercontrol.h"
-#include "llviewermessage.h"
 #include "llfloaterdirectory.h"
 #include "llpanelprofile.h"
 #include "llpanelplaces.h"
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index b6aa564725..e3bc94c2c8 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -1,45 +1,34 @@
-/** 
+/**
  * @file llpaneldirbrowser.h
- * @brief LLPanelDirBrowser class definition
+ * @brief Base class for panels in the legacy Search directory.
  *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2025&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * Copyright (C) 2025, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
-// Base class for the various search panels/results browsers
-// in the Find floater.  For example, Find > Popular Places
-// is derived from this.
-
 #ifndef LL_LLPANELDIRBROWSER_H
 #define LL_LLPANELDIRBROWSER_H
 
 #include "llpanel.h"
 
-#include "lluuid.h"
 #include "llframetimer.h"
 
 class LLMessageSystem;
diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp
index 2e221f393a..631057b101 100644
--- a/indra/newview/llpaneldirplaces.cpp
+++ b/indra/newview/llpaneldirplaces.cpp
@@ -28,15 +28,11 @@
 
 #include "llpaneldirplaces.h"
 
-// linden library includes
-#include "llfontgl.h"
 #include "message.h"
-#include "lldir.h"
 #include "llparcel.h"
 #include "llregionflags.h"
 #include "llqueryflags.h"
 
-// viewer project includes
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
@@ -73,24 +69,13 @@ bool LLPanelDirPlaces::postBuild()
     childSetVisible("Category", true);
     childSetEnabled("Category", true);
 
-    // Don't prepopulate the places list, as it hurts the database as of 2006-12-04. JC
-    // initialQuery();
-
     return true;
 }
 
 LLPanelDirPlaces::~LLPanelDirPlaces()
 {
-    // MBW -- HACK!!!
-    // This looks like some sort of compiler bug.  We have a mysterious crash during initialization on powerpc boxes.
-    // The crash seems unrelated to this code, but the commit that introduced it was narrowed down to this file.
-    // Adding llinfos calls to both the constructor and destructor here makes the crash go away, even though they don't get called before the point of the crash.
-    // This is wrong on many levels and scares the hell out of me.
-    LL_INFOS() << "called" << LL_ENDL;
-    // Children all cleaned up by default view destructor.
 }
 
-
 // virtual
 void LLPanelDirPlaces::draw()
 {
diff --git a/indra/newview/llpaneldirweb.cpp b/indra/newview/llpaneldirweb.cpp
new file mode 100644
index 0000000000..ec0635a407
--- /dev/null
+++ b/indra/newview/llpaneldirweb.cpp
@@ -0,0 +1,149 @@
+/**
+ * @file llpaneldirweb.cpp
+ * @brief Web panel in the legacy Search directory.
+ *
+ * $LicenseInfo:firstyear=2025&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2025, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpaneldirweb.h"
+
+#include "llagent.h"
+#include "llbutton.h"
+#include "llfloaterdirectory.h"
+#include "lltextbox.h"
+#include "llviewercontrol.h"
+#include "llweb.h"
+
+static LLPanelInjector<LLPanelDirWeb> t_panel_dir_web("panel_dir_web");
+
+LLPanelDirWeb::LLPanelDirWeb()
+:   LLPanel(),
+    mFloaterDirectory(nullptr),
+    mWebBrowser(nullptr)
+{
+}
+
+bool LLPanelDirWeb::postBuild()
+{
+    childSetAction("home_btn", onClickHome, this);
+
+    mBtnBack = getChild<LLButton>("back_btn");
+    mBtnForward = getChild<LLButton>("forward_btn");
+    mStatusBarText = getChild<LLTextBox>("statusbartext");
+
+    mBtnBack->setClickedCallback([this](LLUICtrl*, const LLSD&) { mWebBrowser->navigateBack(); });
+    mBtnForward->setClickedCallback([this](LLUICtrl*, const LLSD&) { mWebBrowser->navigateForward(); });
+
+    mWebBrowser = findChild<LLMediaCtrl>("web_search");
+    navigateToDefaultPage();
+    mWebBrowser->addObserver(this);
+
+    return true;
+}
+
+void LLPanelDirWeb::draw()
+{
+    // Asynchronous so we need to keep checking
+    mBtnBack->setEnabled(mWebBrowser->canNavigateBack());
+    mBtnForward->setEnabled(mWebBrowser->canNavigateForward());
+
+    LLPanel::draw();
+}
+
+LLPanelDirWeb::~LLPanelDirWeb()
+{
+}
+
+// When we show any browser-based view, we want to hide all
+// the right-side XUI detail panels.
+// virtual
+void LLPanelDirWeb::onVisibilityChange(bool new_visibility)
+{
+    if (new_visibility && mFloaterDirectory)
+    {
+        mFloaterDirectory->hideAllDetailPanels();
+    }
+    LLPanel::onVisibilityChange(new_visibility);
+}
+
+void LLPanelDirWeb::navigateToDefaultPage()
+{
+    std::string url = gSavedSettings.getString("SearchURL");
+
+    LLSD subs;
+    subs["QUERY"] = "";
+    subs["TYPE"] = "standard";
+    // Default to PG
+    std::string maturity = "g";
+    if (gAgent.prefersAdult())
+    {
+        // PG,Mature,Adult
+        maturity = "gma";
+    }
+    else if (gAgent.prefersMature())
+    {
+        // PG,Mature
+        maturity = "gm";
+    }
+    subs["MATURITY"] = maturity;
+    
+    url = LLWeb::expandURLSubstitutions(url, subs);
+    mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
+}
+
+// static
+void LLPanelDirWeb::onClickHome( void* data )
+{
+    LLPanelDirWeb* self = (LLPanelDirWeb*)data;
+    if (!self)
+        return;
+    self->navigateToDefaultPage();
+}
+
+void LLPanelDirWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
+{
+    if (event == MEDIA_EVENT_LOCATION_CHANGED)
+    {
+        const std::string url = self->getLocation();
+        if (url.length())
+            mStatusBarText->setText(url);
+    }
+    else if (event == MEDIA_EVENT_NAVIGATE_COMPLETE)
+    {
+        // we populate the status bar with URLs as they change so clear it now we're done
+        const std::string end_str = "";
+        mStatusBarText->setText(end_str);
+    }
+    else if (event == MEDIA_EVENT_STATUS_TEXT_CHANGED)
+    {
+        const std::string text = self->getStatusText();
+        if (text.length())
+            mStatusBarText->setText(text);
+    }
+    else if (event == MEDIA_EVENT_LINK_HOVERED)
+    {
+        const std::string link = self->getHoverLink();
+        mStatusBarText->setText(link);
+    }
+}
diff --git a/indra/newview/llpaneldirweb.h b/indra/newview/llpaneldirweb.h
new file mode 100644
index 0000000000..0287c5006c
--- /dev/null
+++ b/indra/newview/llpaneldirweb.h
@@ -0,0 +1,63 @@
+/**
+ * @file llpaneldirweb.h
+ * @brief Web panel in the legacy Search directory.
+ *
+ * $LicenseInfo:firstyear=2025&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2025, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPANELDIRWEB_H
+#define LL_LLPANELDIRWEB_H
+
+#include "llpanel.h"
+#include "llmediactrl.h"
+
+class LLTextBox;
+class LLFloaterDirectory;
+class LLWebBrowserCtrlObserver;
+
+class LLPanelDirWeb : public LLPanel, public LLViewerMediaObserver
+{
+public:
+    LLPanelDirWeb();
+    ~LLPanelDirWeb();
+
+    bool postBuild() override;
+    void onVisibilityChange(bool new_visibility);
+    void draw();
+
+    void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+
+    void navigateToDefaultPage();
+
+    void setFloaterDirectory(LLFloaterDirectory* floater) { mFloaterDirectory = floater; }
+
+protected:
+    static void onClickHome( void* data );
+
+    LLButton* mBtnBack;
+    LLButton* mBtnForward;
+    LLTextBox* mStatusBarText;
+    LLFloaterDirectory* mFloaterDirectory;
+    LLMediaCtrl* mWebBrowser;
+};
+
+#endif
diff --git a/indra/newview/llpaneleventinfo.cpp b/indra/newview/llpaneleventinfo.cpp
index aaafbc6b32..43b20b3851 100644
--- a/indra/newview/llpaneleventinfo.cpp
+++ b/indra/newview/llpaneleventinfo.cpp
@@ -27,25 +27,15 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llpaneleventinfo.h"
-#include "message.h"
-#include "llui.h"
 
 #include "llagent.h"
-#include "llviewerwindow.h"
 #include "llbutton.h"
-#include "llcachename.h"
 #include "lleventflags.h"
-#include "llfloater.h"
 #include "llfloaterreg.h"
 #include "llfloaterworldmap.h"
-#include "llinventorymodel.h"
 #include "lltextbox.h"
 #include "llviewertexteditor.h"
-#include "lluiconstants.h"
-#include "llviewercontrol.h"
-#include "llweb.h"
 #include "llworldmap.h"
-#include "lluictrlfactory.h"
 
 static LLPanelInjector<LLPanelEventInfo> t_panel_event_info("panel_event_info");
 
@@ -54,7 +44,6 @@ LLPanelEventInfo::LLPanelEventInfo()
 {
 }
 
-
 LLPanelEventInfo::~LLPanelEventInfo()
 {
     if (mEventInfoConnection.connected())
@@ -63,7 +52,6 @@ LLPanelEventInfo::~LLPanelEventInfo()
     }
 }
 
-
 bool LLPanelEventInfo::postBuild()
 {
     mTBName = getChild<LLTextBox>("event_name");
@@ -72,7 +60,7 @@ bool LLPanelEventInfo::postBuild()
     mTBDate = getChild<LLTextBox>("event_date");
     mTBDuration = getChild<LLTextBox>("event_duration");
     mTBDesc = getChild<LLTextEditor>("event_desc");
-    mTBDesc->setWordWrap(TRUE);
+    mTBDesc->setWordWrap(true);
 
     mTBRunBy = getChild<LLTextBox>("event_runby");
     mTBLocation = getChild<LLTextBox>("event_location");
@@ -121,9 +109,11 @@ bool LLPanelEventInfo::processEventInfoReply(LLEventInfo event)
         return false;
 
     mTBName->setText(event.mName);
+    mTBName->setToolTip(event.mName);
     mTBCategory->setText(event.mCategoryStr);
     mTBDate->setText(event.mTimeStr);
     mTBDesc->setText(event.mDesc);
+    mTBRunBy->setText(LLSLURL("agent", event.mRunByID, "inspect").getSLURLString());
 
     mTBDuration->setText(llformat("%d:%.2d", event.mDuration / 60, event.mDuration % 60));
 
@@ -136,15 +126,7 @@ bool LLPanelEventInfo::processEventInfoReply(LLEventInfo event)
         mTBCover->setText(llformat("%d", event.mCover));
     }
 
-    F32 global_x = (F32)event.mPosGlobal.mdV[VX];
-    F32 global_y = (F32)event.mPosGlobal.mdV[VY];
-
-    S32 region_x = llround(global_x) % REGION_WIDTH_UNITS;
-    S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
-    S32 region_z = (S32)llround((F32)event.mPosGlobal.mdV[VZ]);
-
-    std::string desc = event.mSimName + llformat(" (%d, %d, %d)", region_x, region_y, region_z);
-    mTBLocation->setText(desc);
+    mTBLocation->setText(LLSLURL(event.mSimName, event.mPosGlobal).getSLURLString());
 
     if (event.mEventFlags & EVENT_FLAG_MATURE)
     {
diff --git a/indra/newview/skins/default/xui/en/floater_directory.xml b/indra/newview/skins/default/xui/en/floater_directory.xml
index 143bfdc0d9..9dd15bfed5 100644
--- a/indra/newview/skins/default/xui/en/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en/floater_directory.xml
@@ -85,6 +85,17 @@
          left="0"
          top="0"
          bottom="-1" />
+        <panel
+         border="false"
+         label="Web"
+         filename="panel_dir_web.xml"
+         class="panel_dir_web"
+         name="panel_dir_web"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         top="0"
+         bottom="-1" />
 </tab_container>
     <panel
      top="65"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_web.xml b/indra/newview/skins/default/xui/en/panel_dir_web.xml
new file mode 100644
index 0000000000..0dde67681a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_dir_web.xml
@@ -0,0 +1,76 @@
+<panel
+ border="true"
+ top="30"
+ follows="all"
+ height="543"
+ label="Web"
+ left="1"
+ mouse_opaque="false"
+ name="panel_dir_web"
+ width="778">
+    <web_browser
+     top="0"
+     left="0"
+     height="515"
+     width="778"
+     follows="all"
+     layout="topleft"
+     name="web_search"
+     trusted_content="true"/>
+    <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Navigate back"
+     follows="left|bottom"
+     height="22"
+     layout="topleft"
+     left="5"
+     name="back_btn"
+     top_pad="7"
+     width="22" />
+    <button
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Navigate forward"
+     follows="left|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="forward_btn"
+     top_delta="0"
+     width="22"/>
+    <button
+     name="home_btn"
+     follows="left|bottom"
+     image_overlay="Home_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     layout="topleft"
+     tool_tip="Search page"
+     left_pad="5"
+     height="22"
+     width="22"/>
+    <text
+     type="string"
+     length="200"
+     follows="bottom|left"
+     height="20"
+     layout="topleft"
+     left_pad="20"
+     top_delta="5"
+     name="statusbartext"
+     parse_urls="false"
+     text_color="0.4 0.4 0.4 1"
+     width="495"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_event_info.xml b/indra/newview/skins/default/xui/en/panel_event_info.xml
index 138ee587bb..9399a80610 100644
--- a/indra/newview/skins/default/xui/en/panel_event_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_event_info.xml
@@ -22,19 +22,13 @@
     </string>
     <text
      top="4"
-     layout="topleft"
-     follows="top|left"
-     font="SansSerif"
-     left="20"
-     name="event_name_label">
-        Name:
-    </text>
-    <text
-     top_delta="0"
      follows="top|left"
      layout="topleft"
-     font="SansSerif"
-     left="120"
+     font="SansSerifBig"
+     left="5"
+     width="417"
+     height="18"
+     use_ellipses="true"
      name="event_name">
         (none)
     </text>
@@ -135,7 +129,7 @@
      follows="top|left"
      layout="topleft"
      font="SansSerif"
-     left="120"
+     left="116"
      name="event_runby">
         (none)
     </text>
@@ -201,21 +195,21 @@
      label="Teleport"
      left="20"
      name="teleport_btn"
-     width="140" />
+     width="130" />
     <button
      bottom_delta="0"
      follows="left|top"
      height="20"
      label="Show on Map"
-     left="165"
+     left="155"
      name="map_btn"
-     width="140" />
+     width="130" />
     <button
-     bottom_delta="-20"
+     bottom_delta="0"
      follows="left|top"
      height="20"
      label="Notify"
-     left="20"
+     left="290"
      name="notify_btn"
-     width="140" />
+     width="130" />
 </panel>
-- 
cgit v1.3


From b44074c1b33883337c7371f802a51ee2ae50f89a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 23 Oct 2025 19:05:18 +0300
Subject: #4411 fix additional search options - category and maturity

---
 indra/newview/app_settings/settings.xml            | 52 +++++++++++++++++
 indra/newview/llpaneldirbrowser.cpp                | 67 ++++------------------
 indra/newview/llpaneldirbrowser.h                  |  3 -
 indra/newview/llpaneldirclassified.cpp             | 51 +++-------------
 indra/newview/llpaneldirclassified.h               |  4 --
 indra/newview/llpaneldirevents.cpp                 | 48 +++-------------
 indra/newview/llpaneldirevents.h                   |  9 +--
 indra/newview/llpaneldirgroups.cpp                 |  2 -
 indra/newview/llpaneldirland.cpp                   | 23 ++------
 indra/newview/llpaneldirland.h                     |  2 -
 indra/newview/llpaneldirplaces.cpp                 | 28 +++------
 indra/newview/llpaneldirplaces.h                   |  6 +-
 .../skins/default/xui/en/panel_classified_info.xml |  1 -
 .../skins/default/xui/en/panel_dir_classified.xml  | 42 ++++----------
 .../skins/default/xui/en/panel_dir_events.xml      | 54 +++++------------
 .../skins/default/xui/en/panel_dir_land.xml        | 67 ++++++++++++++--------
 .../skins/default/xui/en/panel_dir_places.xml      | 56 +++++-------------
 .../skins/default/xui/en/panel_event_info.xml      |  3 -
 18 files changed, 172 insertions(+), 346 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 98bf49b55a..47cebe6472 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11107,6 +11107,45 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowPGClassifieds</key>
+    <map>
+      <key>Comment</key>
+      <string>Display results of find classifieds that are flagged as general</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>ShowMatureClassifieds</key>
+    <map>
+      <key>Comment</key>
+      <string>Display results of find classifieds that are flagged as moderate</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>ShowAdultClassifieds</key>
+    <map>
+      <key>Comment</key>
+      <string>Display results of find classifieds that are flagged as adult</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowPGSims</key>
     <map>
       <key>Comment</key>
@@ -11159,6 +11198,19 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>ShowMatureGroups</key>
+    <map>
+      <key>Comment</key>
+      <string>Include groups that are flagged as mature to Search results</string>
+      <key>Persist</key>
+      <integer>1</integer>
+	  <key>HideFromEditor</key>
+	  <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowNearClip</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 2391ced6ed..686a4866d5 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -249,52 +249,6 @@ std::string LLPanelDirBrowser::filterShortWords(const std::string source_string,
     return dest_string.str();
 }
 
-void LLPanelDirBrowser::updateMaturityCheckbox()
-{
-    BOOL godlike = gAgent.isGodlike();
-    // You only have a choice if your maturity is 'mature' or higher.
-    // Logic: if you're not at least mature, hide the mature and adult options
-    // After that, enable only the options you can legitimately choose.
-    // If you're PG only, show you the checkbox but don't let you change it.
-    // If you're God, you have everything.
-    bool mature_enabled = gAgent.canAccessMature() || godlike;
-    bool adult_enabled = gAgent.canAccessAdult() || godlike;
-
-    // TODO: fix maturity settings
-    // These check boxes can only be checked if you have the right access to use them
-    //std::string control_name_pg = getChild<LLCheckBoxCtrl>("incpg")->getControlName();
-    //std::string control_name_mature = getChild<LLCheckBoxCtrl>("incmature")->getControlName();
-    //std::string control_name_adult = getChild<LLCheckBoxCtrl>("incadult")->getControlName();
-
-    //childSetValue("incpg", gSavedSettings.getBOOL(control_name_pg));
-    //childSetValue("incmature", gSavedSettings.getBOOL(control_name_mature) && mature_enabled);
-    //childSetValue("incadult", gSavedSettings.getBOOL(control_name_adult) && adult_enabled);
-
-    childSetValue("incpg", true);
-    childSetValue("incmature", true);
-    childSetValue("incadult", true);
-
-    // Teens don't get mature/adult choices
-    if (gAgent.wantsPGOnly())
-    {
-        childSetVisible("incmature", false);
-        childSetVisible("incadult", false);
-        childSetValue("incpg", TRUE);
-        childDisable("incpg");
-    }
-
-    childSetEnabled("incmature", mature_enabled);		
-    childSetEnabled("incadult", adult_enabled);
-
-    if (mature_enabled)
-    {
-        childEnable("incpg");
-        childSetVisible("incpg", TRUE);
-        childSetVisible("incmature", TRUE);
-        childSetVisible("incadult", TRUE);
-    }
-}
-
 void LLPanelDirBrowser::selectByUUID(const LLUUID& id)
 {
     LLCtrlListInterface *list = childGetListInterface("results");
@@ -598,7 +552,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
         std::string buffer = llformat("%.0f", (F64)dwell);
         row["columns"][3]["column"] = "dwell";
         row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SANSSERIFSMALL";
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -736,11 +690,11 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
 
         row["columns"][2]["column"] = "date";
         row["columns"][2]["value"] = date;
-        row["columns"][2]["font"] = "SANSSERIFSMALL";
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         row["columns"][3]["column"] = "time";
         row["columns"][3]["value"] = llformat("%u", unix_time);
-        row["columns"][3]["font"] = "SANSSERIFSMALL";
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         list->addElement(row, ADD_TOP /*ADD_SORTED*/);
 
@@ -822,7 +776,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
 
         row["columns"][2]["column"] = "members";
         row["columns"][2]["value"] = members;
-        row["columns"][2]["font"] = "SANSSERIFSMALL";
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         row["columns"][3]["column"] = "score";
         row["columns"][3]["value"] = search_order;
@@ -979,7 +933,6 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
         if ( msg->getSizeFast(_PREHASH_QueryReplies, i, _PREHASH_ProductSKU) > 0 )
         {
             msg->getStringFast(_PREHASH_QueryReplies, _PREHASH_ProductSKU, land_sku, i);
-            LL_INFOS() << "Land sku: " << land_sku << LL_ENDL;
             land_type = LLProductInfoRequestManager::instance().getDescriptionForSku(land_sku);
         }
         else
@@ -1011,12 +964,12 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
         }
         row["columns"][3]["column"] = "price";
         row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SANSSERIFSMALL";
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         buffer = llformat("%d", actual_area);
         row["columns"][4]["column"] = "area";
         row["columns"][4]["value"] = buffer;
-        row["columns"][4]["font"] = "SANSSERIFSMALL";
+        row["columns"][4]["font"] = "SansSerifSmall";
 
         if (!auction)
         {
@@ -1033,19 +986,19 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
             buffer = llformat("%.1f", price_per_meter);
             row["columns"][5]["column"] = "per_meter";
             row["columns"][5]["value"] = buffer;
-            row["columns"][5]["font"] = "SANSSERIFSMALL";
+            row["columns"][5]["font"] = "SansSerifSmall";
         }
         else
         {
             // Auctions start at L$1 per meter
             row["columns"][5]["column"] = "per_meter";
             row["columns"][5]["value"] = "1.0";
-            row["columns"][5]["font"] = "SANSSERIFSMALL";
+            row["columns"][5]["font"] = "SansSerifSmall";
         }
 
         row["columns"][6]["column"] = "landtype";
         row["columns"][6]["value"] = land_type;
-        row["columns"][6]["font"] = "SANSSERIFSMALL";
+        row["columns"][6]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -1080,7 +1033,7 @@ void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& p
 
     row["columns"][2]["column"] = "price";
     row["columns"][2]["value"] = price_for_listing;
-    row["columns"][2]["font"] = "SANSSERIFSMALL";
+    row["columns"][2]["font"] = "SansSerifSmall";
 
     list->addElement(row);
 }
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index e3bc94c2c8..9891b7b0db 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -105,9 +105,6 @@ public:
 
     std::string filterShortWords( const std::string source_string, int shortest_word_length, bool& was_filtered );
 
-    // Logic to control maturity checkboxes in Classified/Events/Places/'Land for Sale' tabs.
-    void updateMaturityCheckbox();
-
 protected:
     void updateResultCount();
 
diff --git a/indra/newview/llpaneldirclassified.cpp b/indra/newview/llpaneldirclassified.cpp
index 9ce6b88b25..cedd91e1bd 100644
--- a/indra/newview/llpaneldirclassified.cpp
+++ b/indra/newview/llpaneldirclassified.cpp
@@ -61,33 +61,7 @@ bool LLPanelDirClassified::postBuild()
 {
     LLPanelDirBrowser::postBuild();
 
-    // Teens don't get mature checkbox
-    if (gAgent.wantsPGOnly())
-    {
-        childSetValue("incmature", FALSE);
-        childSetValue("incadult", FALSE);
-        childSetVisible("incmature", false);
-        childSetVisible("incadult", false);
-        childSetValue("incpg", TRUE);
-        childDisable("incpg");
-    }
-
-    bool mature_enabled = gAgent.canAccessMature();
-    if (!mature_enabled)
-    {
-        childSetValue("incmature", FALSE);
-        childDisable("incmature");
-    }
-
-    bool adult_enabled = gAgent.canAccessAdult();
-    if (!adult_enabled)
-    {
-        childSetValue("incadult", FALSE);
-        childDisable("incadult");
-    }
-
     childSetAction("Search", onClickSearchCore, this);
-
     return true;
 }
 
@@ -95,23 +69,12 @@ LLPanelDirClassified::~LLPanelDirClassified()
 {
 }
 
-void LLPanelDirClassified::draw()
-{
-    refresh();
-
-    LLPanelDirBrowser::draw();
-}
-
-void LLPanelDirClassified::refresh()
-{
-    updateMaturityCheckbox();
-}
-
 void LLPanelDirClassified::performQuery()
 {
-    BOOL inc_pg = childGetValue("incpg").asBoolean();
-    BOOL inc_mature = childGetValue("incmature").asBoolean();
-    BOOL inc_adult = childGetValue("incadult").asBoolean();
+    static LLUICachedControl<bool> inc_pg("ShowPGClassifieds", true);
+    static LLUICachedControl<bool> inc_mature("ShowMatureClassifieds", false);
+    static LLUICachedControl<bool> inc_adult("ShowAdultClassifieds", false);
+
     if (!(inc_pg || inc_mature || inc_adult))
     {
         LLNotificationsUtil::add("NoContentToSearch");
@@ -129,9 +92,9 @@ void LLPanelDirClassified::performQuery()
     msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 
     bool filter_auto_renew = false;
-    U32 query_flags = pack_classified_flags_request(filter_auto_renew, inc_pg, inc_mature, inc_adult);
-    //if (gAgent.isTeen()) query_flags |= DFQ_PG_SIMS_ONLY;
-
+    U32 query_flags = pack_classified_flags_request(filter_auto_renew, inc_pg,
+                                                                       inc_mature && gAgent.canAccessMature(),
+                                                                       inc_adult && gAgent.canAccessAdult());
     U32 category = childGetValue("Category").asInteger();
 	
     msg->nextBlockFast(_PREHASH_QueryData);
diff --git a/indra/newview/llpaneldirclassified.h b/indra/newview/llpaneldirclassified.h
index 76c3d8635a..6682f73929 100644
--- a/indra/newview/llpaneldirclassified.h
+++ b/indra/newview/llpaneldirclassified.h
@@ -42,12 +42,8 @@ public:
     LLPanelDirClassified();
     /*virtual*/ ~LLPanelDirClassified();
 
-    /*virtual*/ void draw();
-
     bool postBuild();
 
-    void refresh();
-
     // Request the classifieds from the database
     void performQuery();
 
diff --git a/indra/newview/llpaneldirevents.cpp b/indra/newview/llpaneldirevents.cpp
index 07a76e050b..868ccc4c33 100644
--- a/indra/newview/llpaneldirevents.cpp
+++ b/indra/newview/llpaneldirevents.cpp
@@ -47,7 +47,6 @@ static LLPanelInjector<LLPanelDirEvents> t_panel_dir_events("panel_dir_events");
 
 LLPanelDirEvents::LLPanelDirEvents()
     : LLPanelDirBrowser(),
-    mDoneQuery(FALSE),
     mDay(0)
 {
     // more results per page for this
@@ -63,8 +62,6 @@ bool LLPanelDirEvents::postBuild()
     childSetAction("<<", onBackBtn, this);
     childSetAction(">>", onForwardBtn, this);
 
-    childSetAction("Today", onClickToday, this);
-
     childSetCommitCallback("mature", onCommitMature, this);
 
     childSetAction("Search", LLPanelDirBrowser::onClickSearchCore, this);
@@ -83,20 +80,6 @@ LLPanelDirEvents::~LLPanelDirEvents()
 {
 }
 
-
-void LLPanelDirEvents::draw()
-{
-    refresh();
-
-    LLPanelDirBrowser::draw();
-}
-
-void LLPanelDirEvents::refresh()
-{
-    updateMaturityCheckbox();
-}
-
-
 void LLPanelDirEvents::setDay(S32 day)
 {
     mDay = day;
@@ -155,19 +138,14 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
     // offset from this day.
     mDay = relative_day;
 
-    mDoneQuery = TRUE;
+    static LLUICachedControl<bool> incpg("ShowPGEvents", true);
+    static LLUICachedControl<bool> incmature("ShowMatureEvents", false);
+    static LLUICachedControl<bool> incadult("ShowAdultEvents", false);
 
     U32 scope = DFQ_DATE_EVENTS;
-    if ( gAgent.wantsPGOnly()) scope |= DFQ_PG_SIMS_ONLY;
-    if ( childGetValue("incpg").asBoolean() ) scope |= DFQ_INC_PG;
-    if ( childGetValue("incmature").asBoolean() ) scope |= DFQ_INC_MATURE;
-    if ( childGetValue("incadult").asBoolean() ) scope |= DFQ_INC_ADULT;
-
-    // Add old query flags in case we are talking to an old server
-    if ( childGetValue("incpg").asBoolean() && !childGetValue("incmature").asBoolean())
-    {
-        scope |= DFQ_PG_EVENTS_ONLY;
-    }
+    if (incpg) scope |= DFQ_INC_PG;
+    if (incmature && gAgent.canAccessMature()) scope |= DFQ_INC_MATURE;
+    if (incadult && gAgent.canAccessAdult()) scope |= DFQ_INC_ADULT;
 
     if ( !( scope & (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT )))
     {
@@ -191,7 +169,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
 
     // Categories are stored in the database in table indra.event_category
     // XML must match.
-    U32 cat_id = childGetValue("category combo").asInteger();
+    U32 cat_id = childGetValue("category_combo").asInteger();
 
     params << cat_id << "|";
     params << childGetValue("event_search_text").asString();
@@ -230,28 +208,16 @@ void LLPanelDirEvents::onDateModeCallback(LLUICtrl* ctrl, void *data)
     LLPanelDirEvents* self = (LLPanelDirEvents*)data;
     if (self->childGetValue("date_mode").asString() == "date")
     {
-        self->childEnable("Today");
         self->childEnable(">>");
         self->childEnable("<<");
     }
     else
     {
-        self->childDisable("Today");
         self->childDisable(">>");
         self->childDisable("<<");
     }
 }
 
-// static
-void LLPanelDirEvents::onClickToday(void *userdata)
-{
-    LLPanelDirEvents *self = (LLPanelDirEvents *)userdata;
-    self->resetSearchStart();
-    self->setDay(0);
-    self->performQuery();
-}
-
-
 // static
 void LLPanelDirEvents::onBackBtn(void* data)
 {
diff --git a/indra/newview/llpaneldirevents.h b/indra/newview/llpaneldirevents.h
index 0383edbe6c..6a86826749 100644
--- a/indra/newview/llpaneldirevents.h
+++ b/indra/newview/llpaneldirevents.h
@@ -38,16 +38,12 @@ public:
     LLPanelDirEvents();
     virtual ~LLPanelDirEvents();
 
-    /*virtual*/ void draw();
-
-    bool postBuild();
+    bool postBuild() override;
 
     /*virtual*/ void performQuery();
 
     void performQueryOrDelete(U32 event_id);
 
-    void refresh();
-
     // pass 0 for today, 1 for tomorrow
     void setDay(S32 day);
 
@@ -55,12 +51,9 @@ protected:
     static void onDateModeCallback(LLUICtrl* ctrl, void *data);
     static void onBackBtn(void* data);
     static void onForwardBtn(void* data);
-    static void onClickToday(void *userdata);
     static void onCommitMature(LLUICtrl* ctrl, void* data);
-    static void onClickSearch(void *data);
 
 protected:
-    bool mDoneQuery;
     S32 mDay; // 0 = today, 1 = tomorrow
 };
 
diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp
index 63ae0f59ab..4809dffe6b 100644
--- a/indra/newview/llpaneldirgroups.cpp
+++ b/indra/newview/llpaneldirgroups.cpp
@@ -32,7 +32,6 @@
 #include "llqueryflags.h"
 #include "llviewercontrol.h"
 #include "llsearcheditor.h"
-#include "message.h"
 
 static LLPanelInjector<LLPanelDirGroups> t_panel_dir_groups("panel_dir_groups");
 
@@ -58,7 +57,6 @@ bool LLPanelDirGroups::postBuild()
 
 LLPanelDirGroups::~LLPanelDirGroups()
 {
-    // Children all cleaned up by default view destructor.
 }
 
 // virtual
diff --git a/indra/newview/llpaneldirland.cpp b/indra/newview/llpaneldirland.cpp
index cce0e4656c..ae1dfae092 100644
--- a/indra/newview/llpaneldirland.cpp
+++ b/indra/newview/llpaneldirland.cpp
@@ -34,21 +34,14 @@
 
 #include "llpaneldirland.h"
 
-// linden library includes
-#include "llfontgl.h"
-#include "llparcel.h"
-#include "llqueryflags.h"
-#include "message.h"
-
-// viewer project includes
 #include "llagent.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
 #include "lllineeditor.h"
 #include "llnotificationsutil.h"
+#include "llqueryflags.h"
 #include "llscrolllistctrl.h"
 #include "llstatusbar.h"
-#include "lluiconstants.h"
 #include "lltextbox.h"
 #include "llviewercontrol.h"
 #include "llviewermessage.h"
@@ -124,14 +117,6 @@ LLPanelDirLand::~LLPanelDirLand()
     // Children all cleaned up by default view destructor.
 }
 
-// virtual
-void LLPanelDirLand::draw()
-{
-    updateMaturityCheckbox();
-
-    LLPanelDirBrowser::draw();
-}
-
 void LLPanelDirLand::onClickSort()
 {
     performQuery();
@@ -159,9 +144,9 @@ void LLPanelDirLand::onCommitArea(LLUICtrl* ctrl, void* data)
 
 void LLPanelDirLand::performQuery()
 {
-    BOOL inc_pg = childGetValue("incpg").asBoolean();
-    BOOL inc_mature = childGetValue("incmature").asBoolean();
-    BOOL inc_adult = childGetValue("incadult").asBoolean();
+    static LLUICachedControl<bool> inc_pg("ShowPGLand", true);
+    static LLUICachedControl<bool> inc_mature("ShowMatureLand", false);
+    static LLUICachedControl<bool> inc_adult("ShowAdultLand", false);
     if (!(inc_pg || inc_mature || inc_adult))
     {
         LLNotificationsUtil::add("NoContentToSearch");
diff --git a/indra/newview/llpaneldirland.h b/indra/newview/llpaneldirland.h
index 50fc633f23..1d3168f19f 100644
--- a/indra/newview/llpaneldirland.h
+++ b/indra/newview/llpaneldirland.h
@@ -44,8 +44,6 @@ public:
     LLPanelDirLand();
     /*virtual*/ ~LLPanelDirLand();
 
-    /*virtual*/ void draw();
-
     bool postBuild();
 
     void performQuery();
diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp
index 631057b101..4268decfe4 100644
--- a/indra/newview/llpaneldirplaces.cpp
+++ b/indra/newview/llpaneldirplaces.cpp
@@ -40,7 +40,6 @@
 #include "llfloaterdirectory.h"
 #include "lllineeditor.h"
 #include "llnotificationsutil.h"
-#include "llviewerwindow.h"
 #include "llpaneldirbrowser.h"
 #include "llsearcheditor.h"
 #include "lltextbox.h"
@@ -66,9 +65,6 @@ bool LLPanelDirPlaces::postBuild()
     mCurrentSortColumn = "dwell";
     mCurrentSortAscending = FALSE;
 
-    childSetVisible("Category", true);
-    childSetEnabled("Category", true);
-
     return true;
 }
 
@@ -76,14 +72,6 @@ LLPanelDirPlaces::~LLPanelDirPlaces()
 {
 }
 
-// virtual
-void LLPanelDirPlaces::draw()
-{
-    updateMaturityCheckbox();
-
-    LLPanelDirBrowser::draw();
-}
-
 // virtual
 void LLPanelDirPlaces::performQuery()
 {
@@ -130,27 +118,25 @@ void LLPanelDirPlaces::performQuery()
     bool adult_enabled = gAgent.canAccessAdult();
     bool mature_enabled = gAgent.canAccessMature();
 
-    if( gSavedSettings.getBOOL("ShowPGSims"))
+    static LLUICachedControl<bool> inc_pg("ShowPGSims", true);
+    static LLUICachedControl<bool> inc_mature("ShowMatureSims", false);
+    static LLUICachedControl<bool> inc_adult("ShowAdultSims", false);
+
+    if (inc_pg)
     {
         flags |= DFQ_INC_PG;
     }
 
-    if( gSavedSettings.getBOOL("ShowMatureSims") && mature_enabled)
+    if (inc_mature && mature_enabled)
     {
         flags |= DFQ_INC_MATURE;
     }
 
-    if( gSavedSettings.getBOOL("ShowAdultSims") && adult_enabled)
+    if (inc_adult && adult_enabled)
     {
         flags |= DFQ_INC_ADULT;
     }
 
-    // Pack old query flag in case we are talking to an old server
-    if ( ((flags & DFQ_INC_PG) == DFQ_INC_PG) && !((flags & DFQ_INC_MATURE) == DFQ_INC_MATURE) )
-    {
-        flags |= DFQ_PG_PARCELS_ONLY;
-    }
- 
     if (0x0 == flags)
     {
         LLNotificationsUtil::add("NoContentToSearch");
diff --git a/indra/newview/llpaneldirplaces.h b/indra/newview/llpaneldirplaces.h
index 9dea576e87..5d91d75810 100644
--- a/indra/newview/llpaneldirplaces.h
+++ b/indra/newview/llpaneldirplaces.h
@@ -37,11 +37,7 @@ public:
     LLPanelDirPlaces();
     virtual ~LLPanelDirPlaces();
 
-    /*virtual*/ void draw();
-
-    bool postBuild();
-
-    static void onClickSearch(void *userdata);
+    bool postBuild() override;
 
     void performQuery();
 
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index afd3f9410b..b05904cd28 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -344,7 +344,6 @@
           width="290"
           height="215">
         <text
-         auto_resize="false"
          follows="left|top"
          font.style="BOLD"
          height="10"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_classified.xml b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
index 8478a513ee..d56c8a8dfa 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
@@ -43,37 +43,17 @@
      mouse_opaque="true"
      name="Category"
      width="128">
-        <combo_item name="AnyCategory" value="0">
-            Any Category
-        </combo_item>
-        <combo_item name="Shopping" value="1">
-            Shopping
-        </combo_item>
-        <combo_item name="LandRental" value="2">
-            Land Rental
-        </combo_item>
-        <combo_item name="PropertyRental" value="3">
-            Property Rental
-        </combo_item>
-        <combo_item name="SpecialAttraction" value="4">
-            Special Attraction
-        </combo_item>
-        <combo_item name="NewProducts" value="5">
-            New Products
-        </combo_item>
-        <combo_item name="Employment" value="6">
-            Employment
-        </combo_item>
-        <combo_item name="Wanted" value="7">
-            Wanted
-        </combo_item>
-        <combo_item name="Service" value="8">
-            Service
-        </combo_item>
-        <combo_item name="Personal" value="9">
-            Personal
-        </combo_item>
-    </combo_box>
+        <combo_item name="AnyCategory" value="0" label="Any Category"/>
+        <combo_item name="Shopping" value="1" label="Shopping"/>
+        <combo_item name="LandRental" value="2" label="Land Rental"/>
+        <combo_item name="PropertyRental" value="3" label="Property Rental"/>
+        <combo_item name="SpecialAttraction" value="4" label="Special Attraction"/>
+        <combo_item name="NewProducts" value="5" label="New Products"/>
+        <combo_item name="Employment" value="6" label="Employment"/>
+        <combo_item name="Wanted" value="7" label="Wanted"/>
+        <combo_item name="Service" value="8" label="Service"/>
+        <combo_item name="Personal" value="9" label="Personal"/>
+     </combo_box>
     <check_box
      left_pad="20"
      control_name="ShowPGClassifieds"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_events.xml b/indra/newview/skins/default/xui/en/panel_dir_events.xml
index 6f21cc06c5..97636d25bb 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_events.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -40,44 +40,21 @@
      height="18"
      max_chars="20"
      mouse_opaque="true"
-     name="category combo"
+     name="category_combo"
      width="128">
-        <combo_item name="All" value="0">
-            Any Category
-        </combo_item>
-        <combo_item name="Discussion" value="18">
-            Discussion
-        </combo_item>
-        <combo_item name="Sports" value="19">
-            Sports
-        </combo_item>
-        <combo_item name="LiveMusic" value="20">
-            Live Music
-        </combo_item>
-        <combo_item name="Commercial" value="22">
-            Commercial
-        </combo_item>
-        <combo_item name="Nightlife/Entertainment" value="23">
-            Nightlife/Entertainment
-        </combo_item>
-        <combo_item name="Games/Contests" value="24">
-            Games/Contests
-        </combo_item>
-        <combo_item name="Pageants" value="25">
-            Pageants
-        </combo_item>
-        <combo_item name="Education" value="26">
-            Education
-        </combo_item>
-        <combo_item name="ArtsandCulture" value="27">
-            Arts and Culture
-        </combo_item>
-        <combo_item name="Charity/SupportGroups" value="28">
-            Charity/Support Groups
-        </combo_item>
-        <combo_item name="Miscellaneous" value="29">
-            Miscellaneous
-        </combo_item>
+        <combo_item name="All" value="0" label="Any Category"/>
+        <combo_item name="Discussion" value="18" label="Discussion"/>
+        <combo_item name="Sports" value="19" label="Sports"/>
+        <combo_item name="LiveMusic" value="20" label="Live Music"/>
+        <combo_item name="LiveDJ" value="30" label="Live DJ"/>
+        <combo_item name="Commercial" value="22" label="Commercial"/>
+        <combo_item name="Nightlife/Entertainment" value="23" label="Nightlife/Entertainment"/>
+        <combo_item name="Games/Contests" value="24" label="Games/Contests"/>
+        <combo_item name="Pageants" value="25" label="Pageants"/>
+        <combo_item name="Education" value="26" label="Education"/>
+        <combo_item name="ArtsandCulture" value="27" label="Arts and Culture"/>
+        <combo_item name="Charity/SupportGroups" value="28" label="Charity/Support Groups"/>
+        <combo_item name="Miscellaneous" value="29" label="Miscellaneous"/>
     </combo_box>
     <check_box
      left_pad="20"
@@ -165,7 +142,6 @@
     </scroll_list>
     <text
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      bottom_delta="-20"
      drop_shadow_visible="true"
@@ -212,6 +188,7 @@
      left="128"
      mouse_opaque="true"
      name="date_mode"
+     initial_value="current"
      width="200">
         <radio_item
          layout="topleft"
@@ -252,7 +229,6 @@
     <text
      top="8"
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      left_pad="1"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_land.xml b/indra/newview/skins/default/xui/en/panel_dir_land.xml
index d82ce7f767..673b9493bb 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_land.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_land.xml
@@ -38,18 +38,10 @@
      mouse_opaque="true"
      name="type"
      width="128">
-        <combo_item name="AllTypes" value="All Types">
-            All Types
-        </combo_item>
-        <combo_item name="Auction" value="Auction">
-            Auction
-        </combo_item>
-        <combo_item name="MainlandSales" value="Mainland Sales">
-            For Sale - Mainland
-        </combo_item>
-        <combo_item name="EstateSales" value="Estate Sales">
-            For Sale - Estate
-        </combo_item>
+        <combo_item name="AllTypes" value="All Types" label="All Types"/>
+        <combo_item name="Auction" value="Auction" label="Auction"/>
+        <combo_item name="MainlandSales" value="Mainland Sales" label="For Sale - Mainland"/>
+        <combo_item name="EstateSales" value="Estate Sales" label="For Sale - Estate"/>
     </combo_box>
     <check_box
      left_pad="20"
@@ -115,7 +107,6 @@
      width="50" />
     <text
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      follows="left|top"
      layout="topleft"
@@ -155,7 +146,6 @@
      width="50" />
     <text
      bg_visible="false"
-     border_drop_shadow_visible="false"
      border_visible="false"
      follows="left|top"
      layout="topleft"
@@ -203,14 +193,43 @@
         <column label="Area" name="area" width="50" />
         <column label="L$/m²" name="per_meter" width="65" />
     </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" />
-    <button bottom="-533" follows="right|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="right|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_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" />
+    <button
+     bottom="-533"
+     follows="right|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="right|bottom"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="&lt; Prev"
+     label_selected="&lt; Prev"
+     mouse_opaque="true"
+     name="&lt; Prev"
+     right="258"
+     width="80" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_places.xml b/indra/newview/skins/default/xui/en/panel_dir_places.xml
index a28a53c12c..4640ef361e 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_places.xml
@@ -32,7 +32,6 @@
     </text>
     <combo_box
      allow_text_entry="false"
-     enabled="false"
      follows="right|top"
      layout="topleft"
      height="18"
@@ -41,47 +40,20 @@
      max_chars="20"
      mouse_opaque="true"
      name="Category"
-     width="128"
-     visible="false">
-        <combo_item name="AnyCategory" value="any">
-            Any Category
-        </combo_item>
-        <combo_item name="LindenLocation" value="linden">
-            Linden Location
-        </combo_item>
-        <combo_item name="Arts&amp;Culture" value="arts">
-            Arts &amp; Culture
-        </combo_item>
-        <combo_item name="Business" value="store">
-            Business
-        </combo_item>
-        <combo_item name="Educational" value="educational">
-            Educational
-        </combo_item>
-        <combo_item name="Gaming" value="game">
-            Gaming
-        </combo_item>
-        <combo_item name="Hangout" value="gather">
-            Hangout
-        </combo_item>
-        <combo_item name="NewcomerFriendly" value="newcomer">
-            Newcomer Friendly
-        </combo_item>
-        <combo_item name="Parks&amp;Nature" value="park">
-            Parks &amp; Nature
-        </combo_item>
-        <combo_item name="Residential" value="home">
-            Residential
-        </combo_item>
-        <combo_item name="Shopping" value="shopping">
-            Shopping
-        </combo_item>
-        <combo_item name="Adult" value="adult">
-            Adult
-        </combo_item>
-        <combo_item name="Other" value="other">
-            Other
-        </combo_item>
+     width="128">
+        <combo_item name="AnyCategory" value="any" label="Any Category"/>
+        <combo_item name="LindenLocation" value="linden" label="Linden Location"/>
+        <combo_item name="Arts&amp;Culture" value="arts" label="Arts &amp; Culture"/>
+        <combo_item name="Business" value="store" label="Business"/>
+        <combo_item name="Educational" value="educational" label="Educational"/>
+        <combo_item name="Gaming" value="game" label="Gaming"/>
+        <combo_item name="Hangout" value="gather" label="Hangout"/>
+        <combo_item name="NewcomerFriendly" value="newcomer" label="Newcomer Friendly"/>
+        <combo_item name="Parks&amp;Nature" value="park" label="Parks &amp; Nature"/>
+        <combo_item name="Residential" value="home" label="Residential"/>
+        <combo_item name="Shopping" value="shopping" label="Shopping"/>
+        <combo_item name="Adult" value="adult" label="Adult"/>
+        <combo_item name="Other" value="other" label="Other"/>
     </combo_box>
     <check_box
      left_pad="20"
diff --git a/indra/newview/skins/default/xui/en/panel_event_info.xml b/indra/newview/skins/default/xui/en/panel_event_info.xml
index 9399a80610..b31918b919 100644
--- a/indra/newview/skins/default/xui/en/panel_event_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_event_info.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="false"
- can_close="true"
- can_minimize="true"
- can_resize="false"
  follows="all"
  height="570"
  left="0"
-- 
cgit v1.3


From 4100b0cd411b4ac0ea9a4b944611bf1d99390a92 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 27 Oct 2025 16:42:04 +0200
Subject: #4411 UI adjustments

---
 indra/newview/app_settings/settings.xml            |  22 ++++
 indra/newview/llpaneldirbrowser.cpp                | 115 +++++++++------------
 indra/newview/llpaneldirbrowser.h                  |  10 +-
 indra/newview/llpaneldirgroups.cpp                 |   2 +-
 indra/newview/llpaneldirplaces.cpp                 |   2 +-
 .../skins/default/xui/en/floater_directory.xml     |   8 +-
 .../skins/default/xui/en/panel_dir_classified.xml  | 104 +++++++++++++------
 .../skins/default/xui/en/panel_dir_events.xml      | 106 +++++++++++++------
 .../skins/default/xui/en/panel_dir_groups.xml      |  55 +++++-----
 .../skins/default/xui/en/panel_dir_land.xml        | 109 ++++++++++++-------
 .../skins/default/xui/en/panel_dir_people.xml      |  52 +++++-----
 .../skins/default/xui/en/panel_dir_places.xml      | 105 +++++++++++++------
 12 files changed, 429 insertions(+), 261 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 47cebe6472..aca9910253 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11211,6 +11211,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FindLandArea</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables filtering of land search results by area</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>FindLandPrice</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables filtering of land search results by price</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowNearClip</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 686a4866d5..ff431c6034 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -85,11 +85,14 @@ bool LLPanelDirBrowser::postBuild()
 {
     childSetCommitCallback("results", onCommitList, this);
 
-    childSetAction("< Prev", onClickPrev, this);
-    childSetVisible("< Prev", false);
+    mPrevPageBtn = getChild<LLButton>("prev_btn");
+    mNextPageBtn = getChild<LLButton>("next_btn");
 
-    childSetAction("Next >", onClickNext, this);
-    childSetVisible("Next >", false);
+    mPrevPageBtn->setClickedCallback([this](LLUICtrl*, const LLSD&){ prevPage(); });
+    mPrevPageBtn->setVisible(false);
+
+    mNextPageBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { nextPage(); });
+    mNextPageBtn->setVisible(false);
 
     return true;
 }
@@ -118,13 +121,13 @@ void LLPanelDirBrowser::draw()
                 if (list->getCanSelect())
                 {
                     list->selectFirstItem(); // select first item by default
-                    childSetFocus("results", TRUE);
+                    childSetFocus("results", true);
                 }
                 // Request specific data from the server
                 onCommitList(NULL, this);
             }
         }
-        mDidAutoSelect = TRUE;
+        mDidAutoSelect = true;
     }
 
     LLPanel::draw();
@@ -135,7 +138,7 @@ void LLPanelDirBrowser::draw()
 void LLPanelDirBrowser::nextPage()
 {
     mSearchStart += mResultsPerPage;
-    childSetVisible("< Prev", true);
+    mPrevPageBtn->setVisible(true);
 
     performQuery();
 }
@@ -145,7 +148,7 @@ void LLPanelDirBrowser::nextPage()
 void LLPanelDirBrowser::prevPage()
 {
     mSearchStart -= mResultsPerPage;
-    childSetVisible("< Prev", mSearchStart > 0);
+    mPrevPageBtn->setVisible(mSearchStart > 0);
 
     performQuery();
 }
@@ -154,8 +157,8 @@ void LLPanelDirBrowser::prevPage()
 void LLPanelDirBrowser::resetSearchStart()
 {
     mSearchStart = 0;
-    childSetVisible("Next >", false);
-    childSetVisible("< Prev", false);
+    mNextPageBtn->setVisible(false);
+    mPrevPageBtn->setVisible(false);
 }
 
 // protected
@@ -168,8 +171,7 @@ void LLPanelDirBrowser::updateResultCount()
 
     if (!mHaveSearchResults) result_count = 0;
 
-    LLView* viewp = getChild<LLView>("Next >");
-    if (viewp && viewp->getVisible()) 
+    if (mNextPageBtn && mNextPageBtn->getVisible()) 
     {
         // Item count be off by a few if bogus items sent from database
         // Just use the number of results per page. JC
@@ -197,21 +199,6 @@ void LLPanelDirBrowser::updateResultCount()
     }
 }
 
-// static
-void LLPanelDirBrowser::onClickPrev(void* data)
-{
-    LLPanelDirBrowser* self = (LLPanelDirBrowser*)data;
-    self->prevPage();
-}
-
-
-// static
-void LLPanelDirBrowser::onClickNext(void* data)
-{
-    LLPanelDirBrowser* self = (LLPanelDirBrowser*)data;
-    self->nextPage();
-}
-
 // static
 std::string LLPanelDirBrowser::filterShortWords(const std::string source_string, int shortest_word_length, bool& was_filtered)
 {
@@ -253,7 +240,7 @@ void LLPanelDirBrowser::selectByUUID(const LLUUID& id)
 {
     LLCtrlListInterface *list = childGetListInterface("results");
     if (!list) return;
-    BOOL found = list->setCurrentByID(id);
+    bool found = list->setCurrentByID(id);
     if (found)
     {
         // we got it, don't wait for network
@@ -478,7 +465,7 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -550,9 +537,9 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
         content["name"] = name;
 
         std::string buffer = llformat("%.0f", (F64)dwell);
-        row["columns"][3]["column"] = "dwell";
-        row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SansSerifSmall";
+        row["columns"][2]["column"] = "dwell";
+        row["columns"][2]["value"] = buffer;
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -563,7 +550,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -707,7 +694,7 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -789,7 +776,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 
@@ -870,7 +857,7 @@ void LLPanelDirBrowser::processDirClassifiedReply(LLMessageSystem* msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
@@ -910,10 +897,10 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
         self->mResultsContents = LLSD();
     }
 
-    BOOL use_price = gSavedSettings.getBOOL("FindLandPrice");
+    bool use_price = gSavedSettings.getBOOL("FindLandPrice");
     S32 limit_price = self->childGetValue("priceedit").asInteger();
 
-    BOOL use_area = gSavedSettings.getBOOL("FindLandArea");
+    bool use_area = gSavedSettings.getBOOL("FindLandArea");
     S32 limit_area = self->childGetValue("areaedit").asInteger();
 
     S32 i;
@@ -962,14 +949,14 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
             buffer = llformat("%d", sale_price);
             non_auction_count++;
         }
-        row["columns"][3]["column"] = "price";
-        row["columns"][3]["value"] = buffer;
-        row["columns"][3]["font"] = "SansSerifSmall";
+        row["columns"][2]["column"] = "price";
+        row["columns"][2]["value"] = buffer;
+        row["columns"][2]["font"] = "SansSerifSmall";
 
         buffer = llformat("%d", actual_area);
-        row["columns"][4]["column"] = "area";
-        row["columns"][4]["value"] = buffer;
-        row["columns"][4]["font"] = "SansSerifSmall";
+        row["columns"][3]["column"] = "area";
+        row["columns"][3]["value"] = buffer;
+        row["columns"][3]["font"] = "SansSerifSmall";
 
         if (!auction)
         {
@@ -984,21 +971,21 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
             }
             // Prices are usually L$1 - L$10 / meter
             buffer = llformat("%.1f", price_per_meter);
-            row["columns"][5]["column"] = "per_meter";
-            row["columns"][5]["value"] = buffer;
-            row["columns"][5]["font"] = "SansSerifSmall";
+            row["columns"][4]["column"] = "per_meter";
+            row["columns"][4]["value"] = buffer;
+            row["columns"][4]["font"] = "SansSerifSmall";
         }
         else
         {
             // Auctions start at L$1 per meter
-            row["columns"][5]["column"] = "per_meter";
-            row["columns"][5]["value"] = "1.0";
-            row["columns"][5]["font"] = "SansSerifSmall";
+            row["columns"][4]["column"] = "per_meter";
+            row["columns"][4]["value"] = "1.0";
+            row["columns"][4]["font"] = "SansSerifSmall";
         }
 
-        row["columns"][6]["column"] = "landtype";
-        row["columns"][6]["value"] = land_type;
-        row["columns"][6]["font"] = "SansSerifSmall";
+        row["columns"][5]["column"] = "landtype";
+        row["columns"][5]["value"] = land_type;
+        row["columns"][5]["font"] = "SansSerifSmall";
 
         list->addElement(row);
         self->mResultsContents[parcel_id.asString()] = content;
@@ -1013,7 +1000,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
 
     // Poke the result received timer
     self->mLastResultTimer.reset();
-    self->mDidAutoSelect = FALSE;
+    self->mDidAutoSelect = false;
 }
 
 void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& pick_id, const std::string& name, const U32 creation_date, const S32 price_for_listing)
@@ -1038,7 +1025,7 @@ void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& p
     list->addElement(row);
 }
 
-LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale,  const std::string& name, S32 *type)
+LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, bool is_auction, bool is_for_sale,  const std::string& name, S32 *type)
 {
     LLSD row;
     row["id"] = parcel_id;
@@ -1070,9 +1057,9 @@ LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, BOOL is_auction,
         *type = PLACE_CODE;
     }
 
-    row["columns"][2]["column"] = "name";
-    row["columns"][2]["value"] = name;
-    row["columns"][2]["font"] = "SANSSERIF";
+    row["columns"][1]["column"] = "name";
+    row["columns"][1]["value"] = name;
+    row["columns"][1]["font"] = "SANSSERIF";
 
     return row;
 }
@@ -1089,8 +1076,8 @@ void LLPanelDirBrowser::setupNewSearch()
 
     // ready the list for results
     list->operateOnAll(LLCtrlListInterface::OP_DELETE);
-    list->setCommentText(std::string("Searching...")); // *TODO: Translate
-    childDisable("results");
+    list->setCommentText(LLTrans::getString("Searching"));
+    list->setEnabled(false);
 
     mResultsReceived = 0;
     mHaveSearchResults = FALSE;
@@ -1151,7 +1138,7 @@ void LLPanelDirBrowser::onKeystrokeName(LLLineEditor* line, void* data)
 }
 
 // setup results when shown
-void LLPanelDirBrowser::onVisibilityChange(BOOL new_visibility)
+void LLPanelDirBrowser::onVisibilityChange(bool new_visibility)
 {
     if (new_visibility)
     {
@@ -1168,7 +1155,7 @@ S32 LLPanelDirBrowser::showNextButton(S32 rows)
     {
         // HACK: The (mResultsPerPage)+1th entry indicates there are 'more'
         bool show_next = (mResultsReceived > mResultsPerPage);
-        childSetVisible("Next >", show_next);
+        mNextPageBtn->setVisible(show_next);
         if (show_next)
         {
             rows -= (mResultsReceived - mResultsPerPage);
@@ -1177,8 +1164,8 @@ S32 LLPanelDirBrowser::showNextButton(S32 rows)
     else
     {
         // Hide page buttons
-        childSetVisible("Next >", false);
-        childSetVisible("< Prev", false);
+        mNextPageBtn->setVisible(false);
+        mPrevPageBtn->setVisible(false);
     }
     return rows;
 }
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index 9891b7b0db..8954f397e7 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -47,7 +47,7 @@ public:
     // Use to get periodic updates.
     virtual void draw();
 
-    virtual void onVisibilityChange(BOOL curVisibilityIn);
+    virtual void onVisibilityChange(bool curVisibilityIn);
 
     // Redo your search for the prev/next page of results
     virtual void prevPage();
@@ -90,10 +90,6 @@ public:
 
     void showEvent(const U32 event_id);
 
-    // Prev/Next page buttons
-    static void onClickNext(void* data);
-    static void onClickPrev(void* data);
-
     static void onCommitList(LLUICtrl* ctrl, void* data);
 
     static void processDirPeopleReply(LLMessageSystem* msg, void**);
@@ -109,7 +105,7 @@ protected:
     void updateResultCount();
 
     void addClassified(LLCtrlListInterface *list, const LLUUID& classified_id, const std::string& name, const U32 creation_date, const S32 price_for_listing);
-    LLSD createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale, const std::string& name, S32 *type);
+    LLSD createLandSale(const LLUUID& parcel_id, bool is_auction, bool is_for_sale, const std::string& name, S32 *type);
 
     static void onKeystrokeName(LLLineEditor* line, void* data);
 
@@ -139,6 +135,8 @@ protected:
     LLFrameTimer mLastResultTimer;
 
     LLFloaterDirectory* mFloaterDirectory;
+    LLButton* mPrevPageBtn;
+    LLButton* mNextPageBtn;
 };
 
 // Codes used for sorting by type.
diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp
index 4809dffe6b..9a8f418a65 100644
--- a/indra/newview/llpaneldirgroups.cpp
+++ b/indra/newview/llpaneldirgroups.cpp
@@ -79,7 +79,7 @@ void LLPanelDirGroups::performQuery()
     }
 
     mCurrentSortColumn = "score";
-    mCurrentSortAscending = FALSE;
+    mCurrentSortAscending = false;
 
     // send the message
     sendDirFindQuery(
diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp
index 4268decfe4..3f1fa2ab05 100644
--- a/indra/newview/llpaneldirplaces.cpp
+++ b/indra/newview/llpaneldirplaces.cpp
@@ -63,7 +63,7 @@ bool LLPanelDirPlaces::postBuild()
     //childDisable("Search");
 
     mCurrentSortColumn = "dwell";
-    mCurrentSortAscending = FALSE;
+    mCurrentSortAscending = false;
 
     return true;
 }
diff --git a/indra/newview/skins/default/xui/en/floater_directory.xml b/indra/newview/skins/default/xui/en/floater_directory.xml
index 9dd15bfed5..3274474337 100644
--- a/indra/newview/skins/default/xui/en/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en/floater_directory.xml
@@ -2,7 +2,7 @@
 <floater
  can_close="true"
  can_drag_on_left="false"
- can_minimize="true"
+ single_instance="true"
  can_resize="true"
  height="570"
  min_height="570"
@@ -110,7 +110,7 @@
     <panel
      top="70"
      follows="bottom|right|top"
-     height="480"
+     height="482"
      left="345"
      visible="false"
      name="panel_group_info_sidetray"
@@ -120,7 +120,7 @@
     <panel
      top="70"
      follows="bottom|right|top"
-     height="480"
+     height="484"
      left="345"
      visible="false"
      name="panel_places"
@@ -130,7 +130,7 @@
     <panel
      top="70"
      follows="bottom|right|top"
-     height="480"
+     height="481"
      left="345"
      visible="false"
      name="panel_classified_info"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_classified.xml b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
index d56c8a8dfa..f4d3ccf748 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_classified.xml
@@ -35,7 +35,7 @@
     <combo_box
      allow_text_entry="false"
      top_delta="0"
-     left="465"
+     left="525"
      layout="topleft"
      follows="right|top"
      height="18"
@@ -55,46 +55,78 @@
         <combo_item name="Personal" value="9" label="Personal"/>
      </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGClassifieds"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureClassifieds"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultClassifieds"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
     <line_editor
      bevel_style="in"
      border_style="line"
      border_thickness="1"
-     top_pad="2"
+     top_pad="3"
      follows="left|right|top"
      layout="topleft"
      font="SansSerif"
@@ -103,7 +135,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -115,7 +147,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -151,27 +183,33 @@
      v_pad="0"
      width="80" />
     <button
-     bottom="-533"
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
      follows="right|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
      follows="right|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     label_selected="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_events.xml b/indra/newview/skins/default/xui/en/panel_dir_events.xml
index 97636d25bb..ffbbbeb251 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_events.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -34,7 +34,7 @@
     <combo_box
      allow_text_entry="false"
      top_delta="0"
-     left="465"
+     left="525"
      layout="topleft"
      follows="right|top"
      height="18"
@@ -57,46 +57,78 @@
         <combo_item name="Miscellaneous" value="29" label="Miscellaneous"/>
     </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGEvents"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureEvents"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultEvents"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
     <line_editor
      bevel_style="in"
      border_style="line"
      border_thickness="1"
-     top_pad="2"
+     top_pad="3"
      follows="left|right|top"
      layout="topleft"
      font="SansSerif"
@@ -105,7 +137,7 @@
      max_length="63"
      mouse_opaque="true"
      name="event_search_text"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -117,7 +149,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -156,36 +188,42 @@
      v_pad="0"
      width="80" />
     <button
-     bottom="-533"
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
      follows="right|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
      follows="right|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     label_selected="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
     <radio_group
      top="5"
      draw_border="false"
      follows="top|left"
      layout="topleft"
      height="16"
-     left="128"
+     left="160"
      mouse_opaque="true"
      name="date_mode"
      initial_value="current"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_groups.xml b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
index 10c90b2964..ed3f709005 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_groups.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_groups.xml
@@ -9,28 +9,35 @@
  name="panel_dir_groups"
  width="778">
     <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
      bottom="-533"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     right="344"
-     mouse_opaque="true"
-     name="Next &gt;"
-     width="80" />
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     right="258"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     width="80" />
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
     <text
      bg_visible="false"
      border_visible="false"
@@ -51,13 +58,13 @@
     <check_box
      top_delta="0"
      control_name="ShowMatureGroups"
-     follows="left|top"
+     follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
      label="Include Mature groups"
-     left="465"
+     left="510"
      mouse_opaque="true"
      name="incmature"
      width="100" />
@@ -73,7 +80,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -85,7 +92,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_dir_land.xml b/indra/newview/skins/default/xui/en/panel_dir_land.xml
index 673b9493bb..61629f3033 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_land.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_land.xml
@@ -7,10 +7,6 @@
     <string name="not_found_text">
         None Found.
     </string>
-    <string name="land_help_text">
-        Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
-        To buy direct, visit the land and click on the place name in the title bar.
-    </string>
     <text
      bg_visible="false"
      border_visible="false"
@@ -33,7 +29,7 @@
      layout="topleft"
      height="18"
      top_delta="0"
-     left="465"
+     left="525"
      max_chars="20"
      mouse_opaque="true"
      name="type"
@@ -44,43 +40,75 @@
         <combo_item name="EstateSales" value="Estate Sales" label="For Sale - Estate"/>
     </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGLand"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureLand"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultLand"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
     <check_box
-     top_pad="2"
+     top_pad="3"
      layout="topleft"
      control_name="FindLandPrice"
      follows="left|top"
@@ -166,10 +194,10 @@
      height="20"
      label="Search"
      top_delta="0"
-     left_pad="15"
+     left="660"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -186,7 +214,6 @@
      search_column="2"
      width="336">
         <column label="" name="icon" width="24" />
-        <column label="" name="type" width="-1" />
         <column dynamicwidth="true" label="Name" name="name" />
         <column label="Type" name="landtype" width="50" />
         <column label="L$ Price" name="price" width="65" />
@@ -209,27 +236,33 @@
      v_pad="0"
      width="328" />
     <button
-     bottom="-533"
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
      follows="right|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     height="22"
+     right="305"
+     bottom="-533"
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
      follows="right|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     label_selected="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_people.xml b/indra/newview/skins/default/xui/en/panel_dir_people.xml
index 5b9fc68f33..fe1a7e9d94 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_people.xml
@@ -42,7 +42,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -53,7 +53,7 @@
      label="Search"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -88,27 +88,33 @@
      v_pad="0"
      width="328" />
     <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
      bottom="-533"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     label_selected="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="330"
-     width="80" />
+     name="prev_btn"
+     width="32" />
     <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="244"
-     width="80" />
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dir_places.xml b/indra/newview/skins/default/xui/en/panel_dir_places.xml
index 4640ef361e..d337f3addf 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_places.xml
@@ -36,7 +36,7 @@
      layout="topleft"
      height="18"
      top_delta="0"
-     left="465"
+     left="525"
      max_chars="20"
      mouse_opaque="true"
      name="Category"
@@ -56,46 +56,78 @@
         <combo_item name="Other" value="other" label="Other"/>
     </combo_box>
     <check_box
-     left_pad="20"
+     left_pad="5"
      control_name="ShowPGSims"
      follows="right|top"
      layout="topleft"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="PG"
+     label=""
      mouse_opaque="true"
      name="incpg"
-     width="35" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_PG_Dark"
+     tool_tip="General"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_general"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowMatureSims"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="true"
-     label="Mature"
+     label=""
      mouse_opaque="true"
      name="incmature"
-     width="56" />
+     width="15" />
+     <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_M_Dark"
+     tool_tip="Moderate"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="16"/>
     <check_box
-     left_pad="5"
+     left_pad="4"
+     top_delta="1"
      layout="topleft"
      control_name="ShowAdultSims"
      follows="right|top"
      font="SansSerifSmall"
      height="16"
      initial_value="false"
-     label="Adult"
+     label=""
      mouse_opaque="true"
      name="incadult"
-     width="50" />
+     width="15" />
+    <icon
+     follows="right|top"
+     height="16"
+     top_delta="-1"
+     image_name="Parcel_R_Dark"
+     tool_tip="Adult"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="16"/>
     <line_editor
      bevel_style="in"
      border_style="line"
      border_thickness="1"
-     top_pad="2"
+     top_pad="3"
      follows="left|right|top"
      layout="topleft"
      font="SansSerif"
@@ -104,7 +136,7 @@
      max_length="63"
      mouse_opaque="true"
      name="name"
-     width="660" />
+     width="650" />
     <button
      follows="right|top"
      layout="topleft"
@@ -116,7 +148,7 @@
      left_pad="5"
      mouse_opaque="true"
      name="Search"
-     width="95" />
+     width="105" />
     <scroll_list
      background_visible="true"
      layout="topleft"
@@ -133,7 +165,6 @@
      search_column="2"
      width="336">
         <column label="" name="icon" width="24" />
-        <column label="" name="type" width="-1" />
         <column dynamicwidth="true" label="Name" name="name" />
         <column label="Traffic" name="dwell" width="75" />
     </scroll_list>
@@ -152,25 +183,33 @@
      v_pad="0"
      width="328" />
     <button
+     image_overlay="Arrow_Left_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     hover_glow_amount="0.15"
+     tool_tip="Previous page"
+     follows="right|bottom"
+     height="22"
+     right="305"
      bottom="-533"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="Next &gt;"
-     mouse_opaque="true"
-     name="Next &gt;"
-     right="344"
-     width="80" />
+     name="prev_btn"
+     width="32" />
     <button
-     bottom_delta="0"
-     follows="left|bottom"
-     font="SansSerif"
-     halign="center"
-     height="20"
-     label="&lt; Prev"
-     mouse_opaque="true"
-     name="&lt; Prev"
-     right="258"
-     width="80" />
+     image_overlay="Arrow_Right_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     chrome="true"
+     tool_tip="Next page"
+     follows="right|bottom"
+     height="22"
+     layout="topleft"
+     left_pad="5"
+     name="next_btn"
+     top_delta="0"
+     width="32"/>
 </panel>
-- 
cgit v1.3


From 84b2861b9e99c5099ee82a12a566119b3de9417e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 27 Oct 2025 23:26:08 +0200
Subject: Mac build fix and clean up

---
 indra/newview/llfloaterdirectory.cpp                 |  1 -
 indra/newview/llfloaterdirectory.h                   |  1 -
 indra/newview/llpaneldirbrowser.cpp                  |  2 +-
 indra/newview/llpaneldirbrowser.h                    |  7 +++++--
 indra/newview/llpaneldirclassified.cpp               |  1 +
 indra/newview/llpaneldirevents.cpp                   | 20 +++++++++++---------
 indra/newview/llpaneldirevents.h                     |  2 +-
 indra/newview/llpaneldirgroups.cpp                   |  1 -
 indra/newview/llpaneldirpeople.cpp                   |  1 -
 indra/newview/llpaneldirplaces.cpp                   |  2 +-
 indra/newview/llpaneldirplaces.h                     |  2 +-
 indra/newview/llpaneldirweb.h                        |  6 +++---
 indra/newview/llviewerfloaterreg.cpp                 |  6 ++++--
 .../skins/default/xui/en/panel_dir_events.xml        |  4 ++--
 14 files changed, 30 insertions(+), 26 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp
index 35f0f7ef5a..e062ca7ac6 100644
--- a/indra/newview/llfloaterdirectory.cpp
+++ b/indra/newview/llfloaterdirectory.cpp
@@ -46,7 +46,6 @@
 
 LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 :   LLFloater(name),
-    mMinimizing(false),
     mPanelAvatarp(nullptr),
     mPanelGroupp(nullptr),
     mPanelPlacep(nullptr),
diff --git a/indra/newview/llfloaterdirectory.h b/indra/newview/llfloaterdirectory.h
index a5f39c895d..de788443be 100644
--- a/indra/newview/llfloaterdirectory.h
+++ b/indra/newview/llfloaterdirectory.h
@@ -73,7 +73,6 @@ public:
     LLPanelClassifiedInfo* mPanelClassifiedp;
 
 private:
-    bool mMinimizing; // HACK: see reshape() for details
     static LLFloaterDirectory *sInstance;
 };
 
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 5431a3af98..8468520c11 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -70,7 +70,7 @@ LLPanelDirBrowser::LLPanelDirBrowser()
     mCurrentSortColumn("name"),
     mCurrentSortAscending(true),
     mSearchStart(0),
-    mResultsPerPage(100),
+    mResultsPerPage(RESULTS_PER_PAGE_DEFAULT),
     mResultsReceived(0),
     mMinSearchChars(1),
     mResultsContents(),
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index 0e82f7e423..cb947f8507 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -45,9 +45,9 @@ public:
     void setFloaterDirectory(LLFloaterDirectory* floater) { mFloaterDirectory = floater; }
 
     // Use to get periodic updates.
-    virtual void draw();
+    void draw() override;
 
-    virtual void onVisibilityChange(bool curVisibilityIn);
+    void onVisibilityChange(bool curVisibilityIn) override;
 
     // Redo your search for the prev/next page of results
     virtual void prevPage();
@@ -139,6 +139,9 @@ protected:
     LLButton* mNextPageBtn;
 };
 
+constexpr S32 RESULTS_PER_PAGE_DEFAULT = 100;
+constexpr S32 RESULTS_PER_PAGE_EVENTS = 200;
+
 // Codes used for sorting by type.
 const S32 INVALID_CODE = -1;
 const S32 EVENT_CODE = 0;
diff --git a/indra/newview/llpaneldirclassified.cpp b/indra/newview/llpaneldirclassified.cpp
index f055e6f05a..ca625b956b 100644
--- a/indra/newview/llpaneldirclassified.cpp
+++ b/indra/newview/llpaneldirclassified.cpp
@@ -62,6 +62,7 @@ bool LLPanelDirClassified::postBuild()
     LLPanelDirBrowser::postBuild();
 
     childSetAction("Search", onClickSearchCore, this);
+    setDefaultBtn("Search");
     return true;
 }
 
diff --git a/indra/newview/llpaneldirevents.cpp b/indra/newview/llpaneldirevents.cpp
index 868ccc4c33..63eba04296 100644
--- a/indra/newview/llpaneldirevents.cpp
+++ b/indra/newview/llpaneldirevents.cpp
@@ -45,12 +45,14 @@
 
 static LLPanelInjector<LLPanelDirEvents> t_panel_dir_events("panel_dir_events");
 
+constexpr S32 DAY_TO_SEC = 24 * 60 * 60;
+
 LLPanelDirEvents::LLPanelDirEvents()
     : LLPanelDirBrowser(),
     mDay(0)
 {
     // more results per page for this
-    mResultsPerPage = 200;
+    mResultsPerPage = RESULTS_PER_PAGE_EVENTS;
 }
 
 bool LLPanelDirEvents::postBuild()
@@ -59,8 +61,8 @@ bool LLPanelDirEvents::postBuild()
 
     childSetCommitCallback("date_mode", onDateModeCallback, this);
 
-    childSetAction("<<", onBackBtn, this);
-    childSetAction(">>", onForwardBtn, this);
+    childSetAction("back_btn", onBackBtn, this);
+    childSetAction("forward_btn", onForwardBtn, this);
 
     childSetCommitCallback("mature", onCommitMature, this);
 
@@ -88,7 +90,7 @@ void LLPanelDirEvents::setDay(S32 day)
     time_t utc_time = time_corrected();
 
     // Correct for offset
-    utc_time += day * 24 * 60 * 60;
+    utc_time += day * DAY_TO_SEC;
 
     // There's only one internal tm buffer.
     struct tm* internal_time;
@@ -120,7 +122,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
     time_t utc_time = time_corrected();
 
     // Correct for offset
-    utc_time += relative_day * 24 * 60 * 60;
+    utc_time += relative_day * DAY_TO_SEC;
 
     // There's only one internal tm buffer.
     struct tm* internal_time;
@@ -208,13 +210,13 @@ void LLPanelDirEvents::onDateModeCallback(LLUICtrl* ctrl, void *data)
     LLPanelDirEvents* self = (LLPanelDirEvents*)data;
     if (self->childGetValue("date_mode").asString() == "date")
     {
-        self->childEnable(">>");
-        self->childEnable("<<");
+        self->childEnable("forward_btn");
+        self->childEnable("back_btn");
     }
     else
     {
-        self->childDisable(">>");
-        self->childDisable("<<");
+        self->childDisable("forward_btn");
+        self->childDisable("back_btn");
     }
 }
 
diff --git a/indra/newview/llpaneldirevents.h b/indra/newview/llpaneldirevents.h
index 6a86826749..596abc5f0e 100644
--- a/indra/newview/llpaneldirevents.h
+++ b/indra/newview/llpaneldirevents.h
@@ -40,7 +40,7 @@ public:
 
     bool postBuild() override;
 
-    /*virtual*/ void performQuery();
+    /*virtual*/ void performQuery() override;
 
     void performQueryOrDelete(U32 event_id);
 
diff --git a/indra/newview/llpaneldirgroups.cpp b/indra/newview/llpaneldirgroups.cpp
index 9a8f418a65..992d92091c 100644
--- a/indra/newview/llpaneldirgroups.cpp
+++ b/indra/newview/llpaneldirgroups.cpp
@@ -49,7 +49,6 @@ bool LLPanelDirGroups::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
     setDefaultBtn( "Search" );
 
     return true;
diff --git a/indra/newview/llpaneldirpeople.cpp b/indra/newview/llpaneldirpeople.cpp
index 976b179fb8..6a55e3bc7c 100644
--- a/indra/newview/llpaneldirpeople.cpp
+++ b/indra/newview/llpaneldirpeople.cpp
@@ -49,7 +49,6 @@ bool LLPanelDirPeople::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
     setDefaultBtn( "Search" );
 
     return true;
diff --git a/indra/newview/llpaneldirplaces.cpp b/indra/newview/llpaneldirplaces.cpp
index 57d9d556b6..2d54566038 100644
--- a/indra/newview/llpaneldirplaces.cpp
+++ b/indra/newview/llpaneldirplaces.cpp
@@ -60,7 +60,7 @@ bool LLPanelDirPlaces::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
+    setDefaultBtn("Search");
 
     mCurrentSortColumn = "dwell";
     mCurrentSortAscending = false;
diff --git a/indra/newview/llpaneldirplaces.h b/indra/newview/llpaneldirplaces.h
index 5d91d75810..069414ebf5 100644
--- a/indra/newview/llpaneldirplaces.h
+++ b/indra/newview/llpaneldirplaces.h
@@ -39,7 +39,7 @@ public:
 
     bool postBuild() override;
 
-    void performQuery();
+    void performQuery() override;
 
     // Initially fill in some data for the panel.
     void initialQuery();
diff --git a/indra/newview/llpaneldirweb.h b/indra/newview/llpaneldirweb.h
index 0287c5006c..db7bdc4a6a 100644
--- a/indra/newview/llpaneldirweb.h
+++ b/indra/newview/llpaneldirweb.h
@@ -41,10 +41,10 @@ public:
     ~LLPanelDirWeb();
 
     bool postBuild() override;
-    void onVisibilityChange(bool new_visibility);
-    void draw();
+    void onVisibilityChange(bool new_visibility) override;
+    void draw() override;
 
-    void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+    void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
 
     void navigateToDefaultPage();
 
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index a17c2f71df..ab5235c3ad 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -232,7 +232,8 @@ public:
                 "upload_model",
                 "upload_script",
                 "upload_sound",
-                "bulk_upload"
+                "bulk_upload",
+                "legacy_search"
             };
             return std::find(blacklist_clicked.begin(), blacklist_clicked.end(), fl_name) == blacklist_clicked.end();
         }
@@ -284,7 +285,8 @@ public:
                 "upload_script",
                 "upload_sound",
                 "bulk_upload",
-                "slapp_test"
+                "slapp_test",
+                "legacy_search"
             };
             return std::find(blacklist_untrusted.begin(), blacklist_untrusted.end(), fl_name) == blacklist_untrusted.end();
         }
diff --git a/indra/newview/skins/default/xui/en/panel_dir_events.xml b/indra/newview/skins/default/xui/en/panel_dir_events.xml
index ffbbbeb251..b194ce5646 100644
--- a/indra/newview/skins/default/xui/en/panel_dir_events.xml
+++ b/indra/newview/skins/default/xui/en/panel_dir_events.xml
@@ -261,7 +261,7 @@
      label_selected="&lt;&lt;"
      left_delta="54"
      mouse_opaque="true"
-     name="&lt;&lt;"
+     name="back_btn"
      tool_tip="Go back a day"
      width="20" />
     <text
@@ -294,7 +294,7 @@
      label_selected="&gt;&gt;"
      left_delta="50"
      mouse_opaque="true"
-     name="&gt;&gt;"
+     name="forward_btn"
      tool_tip="Go forward a day"
      width="20" />
 </panel>
-- 
cgit v1.3