diff options
| author | Don Kjer <don@lindenlab.com> | 2011-05-17 21:01:36 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-05-17 21:01:36 +0000 |
| commit | 0a86e39d90e06f0a690b1ff5caf2dee5fe347f8f (patch) | |
| tree | c0e4f0df907c3f876dafdab3caa83e9356434fa9 /indra/newview/llstartup.cpp | |
| parent | ae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (diff) | |
| parent | 79459bc9ba8cefa67091e65dd676f50c9ddc612d (diff) | |
Merge with viewer-development (mesh)
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 44c9d9a588..534540ee31 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()) { LL_DEBUGS("AppInit") << "Starting automatic playback" << LL_ENDL; gAgentPilot.startPlayback(); @@ -3069,6 +3069,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()) { |