Second Life viewer sources 1.18.6.0-RC

1 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 3dd419f..640cbef 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -276,7 +276,7 @@ std::string LLPanelDirFindAll::getSearchURLSuffix(bool mature_in)
                 mature = false;
         }
 
-        std::string url = gSavedSettings.getString("SearchURLSuffix");
+        std::string url = gSavedSettings.getString("SearchURLSuffix2");
 
         // if the mature checkbox is unchecked, modify query to remove 
         // terms with given phrase from the result set
@@ -314,6 +314,11 @@ std::string LLPanelDirFindAll::getSearchURLSuffix(bool mature_in)
         substring = "[Z]";
         url.replace(url.find(substring), substring.length(), z);
 
+        LLUUID session_id = gAgent.getSessionID();
+        std::string session_string = session_id.getString();
+        substring = "[SESSION]";
+        url.replace(url.find(substring), substring.length(), session_string);
+
         return url;
 }
 
@@ -366,6 +371,8 @@ void LLPanelDirFindAll::onClickSearch(void* data)
         LLPanelDirFindAll* self = ( LLPanelDirFindAll* )data;
         LLString search_text = self->childGetText("search_editor");
         self->search(search_text);
+
+        LLFloaterDirectory::sNewSearchCount++;
 }
 
 void LLPanelDirFindAll::onNavigateBegin( const EventType& eventIn )