diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
commit | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (patch) | |
tree | 70c1731808e5449a56b8a38007c6c952bb559f48 /indra/newview/llagentpilot.cpp | |
parent | d0cba9e9194841e8867afcbd02b3792b652756ab (diff) | |
parent | ee39db49a38a626e72e1924e4c157b16d90e8ee6 (diff) |
Automated merge from mesh-development
Diffstat (limited to 'indra/newview/llagentpilot.cpp')
-rw-r--r-- | indra/newview/llagentpilot.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp index 13e1023185..afeba6bdf0 100644 --- a/indra/newview/llagentpilot.cpp +++ b/indra/newview/llagentpilot.cpp @@ -178,6 +178,8 @@ void LLAgentPilot::stopPlayback() } } +#define SKIP_PILOT_LOGGING 1 + void LLAgentPilot::updateTarget() { if (mPlaying) @@ -195,7 +197,9 @@ void LLAgentPilot::updateTarget() { if (!mStarted) { +#if SKIP_PILOT_LOGGING llinfos << "At start, beginning playback" << llendl; +#endif mTimer.reset(); mStarted = TRUE; } @@ -218,17 +222,23 @@ void LLAgentPilot::updateTarget() { if ((mNumRuns < 0) || (mNumRuns > 0)) { +#if SKIP_PILOT_LOGGING llinfos << "Looping, restarting playback" << llendl; +#endif startPlayback(); } else if (mQuitAfterRuns) { +#if SKIP_PILOT_LOGGING llinfos << "Done with all runs, quitting viewer!" << llendl; +#endif LLAppViewer::instance()->forceQuit(); } else { +#if SKIP_PILOT_LOGGING llinfos << "Done with all runs, disabling pilot" << llendl; +#endif stopPlayback(); } } |