Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llagentpilot.cpp
View File

@@ -72,13 +72,13 @@ void LLAgentPilot::load(const std::string& filename)
if (!file)
{
lldebugs << "Couldn't open " << filename
<< ", aborting agentpilot load!" << llendl;
LL_DEBUGS() << "Couldn't open " << filename
<< ", aborting agentpilot load!" << LL_ENDL;
return;
}
else
{
llinfos << "Opening pilot file " << filename << llendl;
LL_INFOS() << "Opening pilot file " << filename << LL_ENDL;
}
S32 num_actions;
@@ -105,7 +105,7 @@ void LLAgentPilot::save(const std::string& filename)
if (!file)
{
llinfos << "Couldn't open " << filename << ", aborting agentpilot save!" << llendl;
LL_INFOS() << "Couldn't open " << filename << ", aborting agentpilot save!" << LL_ENDL;
}
file << mActions.count() << '\n';
@@ -137,7 +137,7 @@ void LLAgentPilot::stopRecord()
void LLAgentPilot::addAction(enum EActionType action_type)
{
llinfos << "Adding waypoint: " << gAgent.getPositionGlobal() << llendl;
LL_INFOS() << "Adding waypoint: " << gAgent.getPositionGlobal() << LL_ENDL;
Action action;
action.mType = action_type;
action.mTarget = gAgent.getPositionGlobal();
@@ -156,13 +156,13 @@ void LLAgentPilot::startPlayback()
if (mActions.count())
{
llinfos << "Starting playback, moving to waypoint 0" << llendl;
LL_INFOS() << "Starting playback, moving to waypoint 0" << LL_ENDL;
gAgent.startAutoPilotGlobal(mActions[0].mTarget);
mStarted = FALSE;
}
else
{
llinfos << "No autopilot data, cancelling!" << llendl;
LL_INFOS() << "No autopilot data, cancelling!" << LL_ENDL;
mPlaying = FALSE;
}
}
@@ -196,7 +196,7 @@ void LLAgentPilot::updateTarget()
{
if (!mStarted)
{
llinfos << "At start, beginning playback" << llendl;
LL_INFOS() << "At start, beginning playback" << LL_ENDL;
mTimer.reset();
LLFrameStats::startLogging(NULL);
mStarted = TRUE;
@@ -221,17 +221,17 @@ void LLAgentPilot::updateTarget()
{
if ((mNumRuns < 0) || (mNumRuns > 0))
{
llinfos << "Looping, restarting playback" << llendl;
LL_INFOS() << "Looping, restarting playback" << LL_ENDL;
startPlayback();
}
else if (mQuitAfterRuns)
{
llinfos << "Done with all runs, quitting viewer!" << llendl;
LL_INFOS() << "Done with all runs, quitting viewer!" << LL_ENDL;
LLAppViewer::instance()->forceQuit();
}
else
{
llinfos << "Done with all runs, disabling pilot" << llendl;
LL_INFOS() << "Done with all runs, disabling pilot" << LL_ENDL;
stopPlayback();
}
}