From c9fdaad8df2741b3a94151b66c574a63a0845529 Mon Sep 17 00:00:00 2001
From: secretfoxtail <remmy@megapahit.net>
Date: Sat, 7 Jun 2025 09:22:02 -0600
Subject: FS search cleanup -> Categories dropdown button

Move categories dropdown button so that it is not cut off by the edge of the floater, also fix "Arts and Culture" & "Parks and Nature" places categories displaying "MissingString"
---
 .../skins/default/xui/en/panel_fs_search_legacy_classifieds.xml     | 6 +++---
 .../newview/skins/default/xui/en/panel_fs_search_legacy_events.xml  | 6 +++---
 .../newview/skins/default/xui/en/panel_fs_search_legacy_places.xml  | 6 +++---
 indra/newview/skins/default/xui/en/strings.xml                      | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml
index 66c35558b1..cdbfd4ac56 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml
@@ -36,16 +36,16 @@
 		 left_delta="0"
 		 name="classifieds_edit"
 		 top="29"
-		 width="651" />
+		 width="650" />
 		<combo_box
 		 follows="right|top"
 		 layout="topleft"
 		 height="23"
 		 allow_text_entry="false"
 		 top_delta="0"
-		 left_pad="2"
+		 left_pad="1"
 		 name="classifieds_category"
-		 width="122">
+		 width="120">
 			<combo_box.commit_callback
 			 function="CommitSearch" />
 		</combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml
index 57cb4990e4..00f5de5ed4 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml
@@ -74,15 +74,15 @@
 		 left="6"
 		 name="events_edit"
 		 top="29"
-		 width="651" />
+		 width="650" />
 		<combo_box
 		 follows="right|top"
 		 layout="topleft"
 		 height="23"
 		 top_delta="0"
-		 left_pad="2"
+		 left_pad="1"
 		 name="events_category"
-		 width="122">
+		 width="120">
 			<combo_box.item label="Any Category" name="any" value="0" />
 			<combo_box.item label="" value="filter_separator" enabled="false" />
 			<combo_box.item label="Discussion" name="discussion" value="18" />
diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml
index 09c142b8fc..c63818f8e3 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml
@@ -36,16 +36,16 @@
 		 left_delta="0"
 		 name="places_edit"
 		 top="29"
-		 width="651" />
+		 width="650" />
 		<combo_box
 		 follows="right|top"
 		 layout="topleft"
 		 height="23"
 		 allow_text_entry="false"
 		 top_delta="0"
-		 left_pad="2"
+		 left_pad="1"
 		 name="places_category"
-		 width="122">
+		 width="120">
 			<combo_box.commit_callback
 			 function="CommitSearch" />
 		</combo_box>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c5a59fac2a..c3cbfed9fb 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2942,13 +2942,13 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .anim
 	<string name="None">None</string>
 	<string name="Linden Location">Linden Location</string>
 	<string name="Adult">Adult</string>
-	<string name="Arts&amp;Culture">Arts &amp; Culture</string>
+	<string name="Arts and Culture">Arts and Culture</string>
 	<string name="Business">Business</string>
 	<string name="Educational">Educational</string>
 	<string name="Gaming">Gaming</string>
 	<string name="Hangout">Hangout</string>
 	<string name="Newcomer Friendly">Newcomer Friendly</string>
-	<string name="Parks&amp;Nature">Parks &amp; Nature</string>
+	<string name="Parks and Nature">Parks and Nature</string>
 	<string name="Residential">Residential</string>
 	<!--<string name="Shopping">Shopping</string>	-->
 	<string name="Stage">Stage</string>
-- 
cgit v1.2.3