summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-02-10 17:26:02 -0800
committerTofu Buzzard <no-email>2011-02-10 17:26:02 -0800
commit5151f02566ddf708d4d5f5cc3a20954bc3a3a48f (patch)
tree92933854693793d8b0850ad2317b8735fd274d3a /indra/newview/llstartup.cpp
parent3738cf241ab547e93c0cd9f0c0250502d93c9092 (diff)
parent536e90a2fa037cd669bbdba7be9afb67e394c812 (diff)
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-xindra/newview/llstartup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index c6efaf4afe..b98cbd5b78 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -424,7 +424,7 @@ bool idle_startup()
//
// Load autopilot and stats stuff
- gAgentPilot.load(gSavedSettings.getString("StatsPilotFile"));
+ gAgentPilot.load();
//gErrorStream.setTime(gSavedSettings.getBOOL("LogTimestamps"));
@@ -1989,7 +1989,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;