Skip to content
Snippets Groups Projects
Commit 935b1c8a authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Support hypergrid search url

parent 4d0545e0
No related branches found
No related tags found
No related merge requests found
...@@ -706,6 +706,17 @@ ...@@ -706,6 +706,17 @@
<key>Value</key> <key>Value</key>
<string /> <string />
</map> </map>
<key>OpenSimSearchURL</key>
<map>
<key>Comment</key>
<string>OpenSim fallback search url</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://search.metaverseink.com/opensim/results.jsp?query=[QUERY]&amp;submit=[CATEGORY]</string>
</map>
<key>RenderAutoMaskAlphaUseRMSE</key> <key>RenderAutoMaskAlphaUseRMSE</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include "llagent.h" #include "llagent.h"
#include "llui.h" #include "llui.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llviewernetwork.h"
#include "llviewerregion.h"
#include "llweb.h" #include "llweb.h"
// support secondlife:///app/search/{CATEGORY}/{QUERY} SLapps // support secondlife:///app/search/{CATEGORY}/{QUERY} SLapps
...@@ -199,7 +201,9 @@ void LLFloaterSearch::search(const SearchQuery &p) ...@@ -199,7 +201,9 @@ void LLFloaterSearch::search(const SearchQuery &p)
// get the search URL and expand all of the substitutions // get the search URL and expand all of the substitutions
// (also adds things like [LANGUAGE], [VERSION], [OS], etc.) // (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
std::string url = gSavedSettings.getString("SearchURL"); LLViewerRegion* regionp = gAgent.getRegion();
std::string url = regionp != nullptr ? regionp->getSearchServerURL()
: gSavedSettings.getString(LLGridManager::getInstance()->isInOpenSim() ? "OpenSimSearchURL" : "SearchURL") :
url = LLWeb::expandURLSubstitutions(url, subs); url = LLWeb::expandURLSubstitutions(url, subs);
// and load the URL in the web view // and load the URL in the web view
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment