1 files changed, 95 insertions, 74 deletions

diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index cb83ee1..ed22477 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -227,8 +227,20 @@ void LLPanelDirFindAll::search(const std::string& search_text)
         
         if (!search_text.empty())
         {
+                // Check whether or not we're on the old or web search All -- MC
+                bool is_web = false;
+                LLPanel* tabs_panel = mFloaterDirectory->getChild<LLTabContainer>("Directory Tabs")->getCurrentPanel();
+                if (tabs_panel)
+                {
+                        is_web = tabs_panel->getName() == "find_all_panel";
+                }
+                else
+                {
+                        llwarns << "search panel not found! How can this be?!" << llendl;
+                }
+
                 std::string selected_collection = childGetValue( "Category" ).asString();
-                std::string url = buildSearchURL(search_text, selected_collection, inc_pg, inc_mature, inc_adult);
+                std::string url = buildSearchURL(search_text, selected_collection, inc_pg, inc_mature, inc_adult, is_web);
                 if (mWebBrowser)
                 {
                         mWebBrowser->navigateTo(url);
@@ -250,26 +262,28 @@ void LLPanelDirFind::focus()
 
 void LLPanelDirFind::navigateToDefaultPage()
 {
-        std::string start_url = gSavedSettings.getString("SearchURLDefault");
-        // Note: beware porting stuff like below. We use the web panel in OpenSim as well as Second Life -- MC
-        /*if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
-                start_url = getString("default_search_page");
-        } else {
-                start_url = gHippoGridManager->getConnectedGrid()->getSearchUrl();
-                start_url += "panel=" + getLabel() + "&";
-        }*/
+        std::string start_url;
+        // Note: we use the web panel in OpenSim as well as Second Life -- MC
+        if (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
+        {
+                start_url = gSavedSettings.getString("SearchURLDefault");
 
-        BOOL inc_pg = childGetValue("incpg").asBoolean();
-        BOOL inc_mature = childGetValue("incmature").asBoolean();
-        BOOL inc_adult = childGetValue("incadult").asBoolean();
-        if (!(inc_pg || inc_mature || inc_adult))
+                BOOL inc_pg = childGetValue("incpg").asBoolean();
+                BOOL inc_mature = childGetValue("incmature").asBoolean();
+                BOOL inc_adult = childGetValue("incadult").asBoolean();
+                if (!(inc_pg || inc_mature || inc_adult))
+                {
+                        // if nothing's checked, just go for pg; we don't notify in
+                        // this case because it's a default page.
+                        inc_pg = true;
+                }
+        
+                start_url += getSearchURLSuffix(inc_pg, inc_mature, inc_adult, true);
+        } 
+        else 
         {
-                // if nothing's checked, just go for pg; we don't notify in
-                // this case because it's a default page.
-                inc_pg = true;
+                start_url = gSavedSettings.getString("SearchURLDefaultOpenSim");
         }
-        
-        start_url += getSearchURLSuffix(inc_pg, inc_mature, inc_adult);
 
         llinfos << "default url: "  << start_url << llendl;
 
@@ -280,11 +294,11 @@ void LLPanelDirFind::navigateToDefaultPage()
 }
 // static
 std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const std::string& collection, 
-                                                                                   bool inc_pg, bool inc_mature, bool inc_adult)
+                                                                                   bool inc_pg, bool inc_mature, bool inc_adult, bool is_web)
 {
         std::string url;
         if (search_text.empty()) {
-                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_EMPTY);
+                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_EMPTY, is_web);
         } else {
                 // Replace spaces with "+" for use by Google search appliance
                 // Yes, this actually works for double-spaces
@@ -307,7 +321,7 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
                         "-._~$+!*'()";
                 std::string query = LLURI::escape(search_text_with_plus, allowed);
 
-                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_QUERY);
+                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_QUERY, is_web);
                 std::string substring = "[QUERY]";
                 std::string::size_type where = url.find(substring);
                 if (where != std::string::npos)
@@ -325,66 +339,73 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
                 }
 
         }
-        url += getSearchURLSuffix(inc_pg, inc_mature, inc_adult);
+        url += getSearchURLSuffix(inc_pg, inc_mature, inc_adult, is_web);
         llinfos << "search url " << url << llendl;
         return url;
 }
 // static
-std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult)
+std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web)
 {
-        std::string url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_TEMPLATE);
-
-        // if the mature checkbox is unchecked, modify query to remove 
-        // terms with given phrase from the result set
-        // This builds a value from 1-7 by or-ing together the flags, and then converts
-        // it to a string. 
-        std::string substring="[MATURITY]";
-        S32 maturityFlag = 
-                (inc_pg ? SEARCH_PG : SEARCH_NONE) |
-                (inc_mature ? SEARCH_MATURE : SEARCH_NONE) |
-                (inc_adult ? SEARCH_ADULT : SEARCH_NONE);
-        url.replace(url.find(substring), substring.length(), boost::lexical_cast<std::string>(maturityFlag));
-        
-        // Include region and x/y position, not for the GSA, but
-        // just to get logs on the web server for search_proxy.php
-        // showing where people were standing when they searched.
-        std::string region_name;
-        LLViewerRegion* region = gAgent.getRegion();
-        if (region)
+        std::string url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_TEMPLATE, is_web);
+
+        if (!url.empty())
         {
-                region_name = region->getName();
+                // Note: opensim's template (SearchURLSuffixOpenSim) is currently empty -- MC
+                if (gHippoGridManager->getConnectedGrid()->isSecondLife())
+                {
+                        // if the mature checkbox is unchecked, modify query to remove 
+                        // terms with given phrase from the result set
+                        // This builds a value from 1-7 by or-ing together the flags, and then converts
+                        // it to a string. 
+                        std::string substring="[MATURITY]";
+                        S32 maturityFlag = 
+                                (inc_pg ? SEARCH_PG : SEARCH_NONE) |
+                                (inc_mature ? SEARCH_MATURE : SEARCH_NONE) |
+                                (inc_adult ? SEARCH_ADULT : SEARCH_NONE);
+                        url.replace(url.find(substring), substring.length(), boost::lexical_cast<std::string>(maturityFlag));
+                        
+                        // Include region and x/y position, not for the GSA, but
+                        // just to get logs on the web server for search_proxy.php
+                        // showing where people were standing when they searched.
+                        std::string region_name;
+                        LLViewerRegion* region = gAgent.getRegion();
+                        if (region)
+                        {
+                                region_name = region->getName();
+                        }
+                        // take care of spaces in names
+                        region_name = LLURI::escape(region_name);
+                        substring = "[REGION]";
+                        url.replace(url.find(substring), substring.length(), region_name);
+
+                        LLVector3 pos_region = gAgent.getPositionAgent();
+
+                        std::string x = llformat("%.0f", pos_region.mV[VX]);
+                        substring = "[X]";
+                        url.replace(url.find(substring), substring.length(), x);
+                        std::string y = llformat("%.0f", pos_region.mV[VY]);
+                        substring = "[Y]";
+                        url.replace(url.find(substring), substring.length(), y);
+                        std::string z = llformat("%.0f", pos_region.mV[VZ]);
+                        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);
+
+                        // set the currently selected language by asking the pref setting
+                        std::string language_string = LLUI::getLanguage();
+                        std::string language_tag = "[LANG]";
+                        url.replace( url.find( language_tag ), language_tag.length(), language_string );
+
+                        // and set the flag for the teen grid
+                        std::string teen_string = gAgent.isTeen() ? "y" : "n";
+                        std::string teen_tag = "[TEEN]";
+                        url.replace( url.find( teen_tag ), teen_tag.length(), teen_string );
+                }       
         }
-        // take care of spaces in names
-        region_name = LLURI::escape(region_name);
-        substring = "[REGION]";
-        url.replace(url.find(substring), substring.length(), region_name);
-
-        LLVector3 pos_region = gAgent.getPositionAgent();
-
-        std::string x = llformat("%.0f", pos_region.mV[VX]);
-        substring = "[X]";
-        url.replace(url.find(substring), substring.length(), x);
-        std::string y = llformat("%.0f", pos_region.mV[VY]);
-        substring = "[Y]";
-        url.replace(url.find(substring), substring.length(), y);
-        std::string z = llformat("%.0f", pos_region.mV[VZ]);
-        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);
-
-        // set the currently selected language by asking the pref setting
-        std::string language_string = LLUI::getLanguage();
-        std::string language_tag = "[LANG]";
-        url.replace( url.find( language_tag ), language_tag.length(), language_string );
-
-        // and set the flag for the teen grid
-        std::string teen_string = gAgent.isTeen() ? "y" : "n";
-        std::string teen_tag = "[TEEN]";
-        url.replace( url.find( teen_tag ), teen_tag.length(), teen_string );    
         
         return url;
 }