From 853e90ea8014ac9c4fb02cb2d2eeffa8ab473f85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 8 Nov 2010 10:37:58 -0500 Subject: removed unused variable --- indra/newview/llfasttimerview.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 027eb09e55..4bcbe665aa 100755 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -1463,7 +1463,6 @@ void LLFastTimerView::doAnalysisDefault(std::string baseline, std::string target std::ofstream os(output.c_str()); LLSD::Real session_time = current["SessionTime"].asReal(); - //LLSD::Real frame_count = current["FrameCount"].asReal(); os << "Label, " "% Change, " -- cgit v1.2.3 From d9c0e0ba74d3f042ae7f3a7310f0c0bf23e6eaa9 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 12 Nov 2010 17:31:27 -0500 Subject: SH-275 FIX: non-production grids now default to different source of map tiles --- indra/newview/app_settings/settings.xml | 0 indra/newview/llstartup.cpp | 5 +++++ 2 files changed, 5 insertions(+) mode change 100644 => 100755 indra/newview/app_settings/settings.xml mode change 100644 => 100755 indra/newview/llstartup.cpp (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml old mode 100644 new mode 100755 diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp old mode 100644 new mode 100755 index 5ee4599200..230dfaea51 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3071,6 +3071,11 @@ bool process_login_success_response() } // Request the map server url + // Non-agni grids have a different default location. + if (!LLGridManager::getInstance()->isInProductionGrid()) + { + gSavedSettings.setString("MapServerURL", "http://test.map.secondlife.com.s3.amazonaws.com/"); + } std::string map_server_url = response["map-server-url"]; if(!map_server_url.empty()) { -- cgit v1.2.3