diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-16 09:08:28 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-16 09:08:28 -0500 |
| commit | 222bda14b6bafb0a62b6d4fac7ec815dea65b4e6 (patch) | |
| tree | f80bd20f6bcf19492797feccbc7bb2adaadb98c1 | |
| parent | 80561014b0c30b6e3ce04f0a23daed612f3c4075 (diff) | |
| parent | 3ea3d4cf16894c928cd60c19429dbec158185f96 (diff) | |
merge
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/settings.xml | 0 | ||||
| -rwxr-xr-x | indra/newview/llfasttimerview.cpp | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llstartup.cpp | 5 |
3 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5cc8c34cd5..5cc8c34cd5 100644..100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml 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, " diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 5ee4599200..230dfaea51 100644..100755 --- 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()) { |