From 17a54ecc2cefa15b1cbb141388bc84faf7ea72d3 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 16 May 2011 15:08:16 -0400 Subject: Use trial server for new search --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 33c5e533be..b36f43a638 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3908,7 +3908,7 @@ Type String Value - http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD] + http://beta.search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD] WebProfileURL -- cgit v1.2.3 From 716bd22fbc0d440ae63fb256b8040148ea041e03 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 16 May 2011 15:46:43 -0400 Subject: Insert parameters for Search project viewer (replacing old Display Name viewer) --- BuildParams | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/BuildParams b/BuildParams index a602be2fe2..dd43827851 100644 --- a/BuildParams +++ b/BuildParams @@ -112,24 +112,12 @@ gooey.viewer_grid = agni gooey.build_viewer_update_version_manager = false # ======================================== -# Display Names project +# Search Project # ======================================== -#viewer-identity-evolution.email = leyla@lindenlab.com -viewer-identity.build_Debug = false -viewer-identity.build_RelWithDebInfo = false -viewer-identity.build_viewer = true -viewer-identity.build_server = false -viewer-identity.build_server_tests = false -viewer-identity.build_Linux = true -viewer-identity.build_hg_bundle = true -viewer-identity.bulld_docs = true -viewer-identity.viewer_channel = "Second Life Project Viewer" -viewer-identity.login_channel = "Second Life Project Viewer" -viewer-identity.viewer_grid = aditi -viewer-identity.build_viewer_update_version_manager = false - - +search_project-viewer.build_debug_release_separately = true +search_project-viewer.viewer_channel = "Project Viewer Search" +search_project-viewer.login_channel = "Project Viewer Search" # ======================================== # palange -- cgit v1.2.3 From e8532721c3376b7097faf985534e625787d85e84 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 17 May 2011 06:50:58 -0400 Subject: correct channel names to include "Second Life" --- BuildParams | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BuildParams b/BuildParams index dd43827851..5f15b857f6 100644 --- a/BuildParams +++ b/BuildParams @@ -116,8 +116,8 @@ gooey.build_viewer_update_version_manager = false # ======================================== search_project-viewer.build_debug_release_separately = true -search_project-viewer.viewer_channel = "Project Viewer Search" -search_project-viewer.login_channel = "Project Viewer Search" +search_project-viewer.viewer_channel = "Second Life Project Viewer - Search" +search_project-viewer.login_channel = "Second Life Project Viewer - Search" # ======================================== # palange -- cgit v1.2.3 From 9aef66cfcc21400bbe3cc40386ec3a37a75054c4 Mon Sep 17 00:00:00 2001 From: Kazu Linden Date: Mon, 23 May 2011 12:49:19 -0700 Subject: changing URL to support SSL --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b36f43a638..95ae6df833 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3908,7 +3908,7 @@ Type String Value - http://beta.search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD] + http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD] WebProfileURL -- cgit v1.2.3 From 01e98f535eab4b8df6b029780d472da778ad4acb Mon Sep 17 00:00:00 2001 From: seth_productengine Date: Tue, 17 May 2011 20:22:46 +0300 Subject: STORM-1260 FIXED Replaced llerrs messages with llwarns in directory iterator code to avoid viewer halt when a cache dir is not found. --- indra/llvfs/lldiriterator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index 5536ed8f69..041436ed92 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -55,7 +55,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) // Check if path exists. if (!fs::exists(dir_path)) { - llerrs << "Invalid path: \"" << dir_path.string() << "\"" << llendl; + llwarns << "Invalid path: \"" << dir_path.string() << "\"" << llendl; return; } @@ -100,7 +100,7 @@ bool LLDirIterator::Impl::next(std::string &fname) if (!mIsValid) { - llerrs << "The iterator is not correctly initialized." << llendl; + llwarns << "The iterator is not correctly initialized." << llendl; return false; } -- cgit v1.2.3