From 3a2fcad0cb06c493f63771f6ca62dea2f4de2374 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Tue, 1 Dec 2009 13:07:41 +0000 Subject: DEV-41358: pass localization information to the Search web pages via a new ?lang= query parameter. --- indra/newview/llfloatersearch.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llfloatersearch.cpp') diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index e2df2ffdf7..c8ff36b4f4 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -37,6 +37,7 @@ #include "lllogininstance.h" #include "lluri.h" #include "llagent.h" +#include "llui.h" LLFloaterSearch::LLFloaterSearch(const LLSD& key) : LLFloater(key), @@ -139,6 +140,9 @@ void LLFloaterSearch::search(const LLSD &key) } url += "&r=" + maturity; + // add the current localization information + url += "&lang=" + LLUI::getLanguage(); + // and load the URL in the web view mBrowser->navigateTo(url); } -- cgit v1.2.3 From d491050c553ad2fa20f1ecadc37077fba3962b10 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Wed, 2 Dec 2009 21:18:59 +0000 Subject: DEV-43439: Added navigation buttons to the Home side panel. Added Back, Forward, and Home buttons to the web view for the Home side panel. Still more work to do here, but the basic functionality is there; albeit hardcoded to secondlife.com. I notice that you can click Back on the first page. Seems to be an issue for the general media browser too. I'll file a JIRA for that. --- indra/newview/llfloatersearch.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloatersearch.cpp') diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index c8ff36b4f4..4d3724a758 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -41,6 +41,7 @@ LLFloaterSearch::LLFloaterSearch(const LLSD& key) : LLFloater(key), + LLViewerMediaObserver(), mBrowser(NULL) { // declare a map that transforms a category name into -- cgit v1.2.3