Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into V2TextureSystem

Browse Source 
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
This commit is contained in:
Shyotl
2011-04-12 22:29:49 -05:00
parent 3a3805fd18 aa1167e4d5
commit 4d4c49cd24
95 changed files with 3056 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpaneldirfind.cpp
View File

@@ -285,6 +285,7 @@ void LLPanelDirFind::navigateToDefaultPage()
{
// OS-based but has its own web search url -- MC
start_url = gHippoGridManager->getConnectedGrid()->getSearchUrl();
start_url += "panel=" + getName() + "&";
}
BOOL inc_pg = childGetValue("incpg").asBoolean();
@@ -365,6 +366,7 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
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, is_web);
llinfos << "Suffix template " << url << llendl;
if (!url.empty())
{