Updated the fix for #721: search lags, to include a checkbox to save search results for users who prefer to lag but keep their search resluts open

3 files changed, 23 insertions, 3 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index ad9cfea..00c30c1 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -957,6 +957,17 @@
     <key>Value</key>
     <real>0.0</real>
   </map>
+  <key>SaveSearchResults</key>
+  <map>
+    <key>Comment</key>
+    <string>Saves search results when closing search window rather than clearing resources</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>ShowLookAtNames</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 7c8ddf1..23a9b81 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -466,9 +466,14 @@ void LLFloaterDirectory::setVisible(BOOL visible)
 
 void LLFloaterDirectory::onClose(bool app_quitting)
 {
-        LLFloater::onClose(app_quitting);
-
-        //setVisible(FALSE); //meaning you hide 3 web browsers - one SLPlugin each
+        if (gSavedSettings.getBOOL("SaveSearchResults"))
+        {
+                setVisible(FALSE); //meaning you hide 3 web browsers - one SLPlugin each
+        }
+        else
+        {
+                LLFloater::onClose(app_quitting);
+        }
 }
 
 // static
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 0424b72..1ea4574 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -726,6 +726,10 @@ To buy direct, visit the land and click on the place name in the title bar.
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
         </tab_container>
+  <check_box name="save_results_check" label="Save search results"
+       bottom="-37" right="-80"  height="16" width="80"
+       follows="right|top" font="SansSerifSmall" control_name="SaveSearchResults"
+       initial_value="false" mouse_opaque="true" />
         <panel bottom="-580" follows="right|top" height="490" left="340"
              name="classified_details_panel" width="440" />
         <panel bottom="-580" follows="right|top" height="506" left="350" name="Panel Avatar"