From f5afedf86aa9a5a629fd1f7604ef48957280a20c Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 13 Jun 2011 21:05:48 -0700
Subject: [PATCH] Add option to change search URL to Preference -> Firesorm ->
 General

---
 .../xui/en/panel_preferences_firestorm.xml    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 523d52efab..733fc79f53 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -251,7 +251,42 @@
       <check_box.commit_callback
       function="FS.ToggleSortContacts" />
       </check_box>
+<!--To be removed when LL migrates beta serch to stable-->
+      <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    layout="topleft"
+    left="30"
+    name="Search_Label"
+    top_delta="25"
+    width="200"
+    tool_tip="While the beta URL often provides more accurate search results, it may not always be available.">
+        Default Search URL:
+      </text>
 
+      <combo_box
+        control_name="SearchURL"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left_delta="200"
+        max_chars="135"
+        name="SearchURL"
+        width="150">
+        <combo_box.item
+         enabled="true"
+         label="Standard V2 search"
+         name="Standard V2 search"
+         value="http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&amp;p=[AUTH_TOKEN]&amp;r=[MATURITY]&amp;lang=[LANGUAGE]&amp;g=[GODLIKE]&amp;sid=[SESSION_ID]&amp;rid=[REGION_ID]&amp;pid=[PARCEL_ID]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]&amp;patch=[VERSION_PATCH]&amp;build=[VERSION_BUILD]" />
+        <combo_box.item
+         enabled="true"
+         label="Beta V2 Search"
+         name="Beta V2 Search"
+         value="http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&amp;p=[AUTH_TOKEN]&amp;r=[MATURITY]&amp;lang=[LANGUAGE]&amp;g=[GODLIKE]&amp;sid=[SESSION_ID]&amp;rid=[REGION_ID]&amp;pid=[PARCEL_ID]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]&amp;patch=[VERSION_PATCH]&amp;build=[VERSION_BUILD]" />
+      </combo_box>
+      
       </panel>
 
 	  <!--View-->