diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
| commit | 8a92612fd976b6e38383d9ee46be5b51053e0998 (patch) | |
| tree | 0c06d99c2b6a8aaa5c78661b488ff8b59b83c523 /indra/newview/llstartup.cpp | |
| parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
| parent | d6fda15c34896db3b911c3719871ce317edaab1d (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ca908ef822..277d2430ce 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -421,7 +421,7 @@ bool idle_startup() // // Load autopilot and stats stuff - gAgentPilot.load(gSavedSettings.getString("StatsPilotFile")); + gAgentPilot.load(); //gErrorStream.setTime(gSavedSettings.getBOOL("LogTimestamps")); @@ -1959,7 +1959,7 @@ bool idle_startup() } // Start automatic replay if the flag is set. - if (gSavedSettings.getBOOL("StatsAutoRun") || LLAgentPilot::sReplaySession) + if (gSavedSettings.getBOOL("StatsAutoRun") || gAgentPilot.getReplaySession()) { LLUUID id; LL_DEBUGS("AppInit") << "Starting automatic playback" << LL_ENDL; @@ -3070,6 +3070,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()) { |