summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerstats.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-14 17:50:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-14 17:50:59 -0400
commit487ca1bad37883be0325b564ab557a8f77575388 (patch)
treea8e7c6163d18f41161f5477c8af31207d2b4eae2 /indra/newview/llviewerstats.cpp
parent7b9708a2e3aede6faef04bd546c497dc68264f58 (diff)
v-r -> s-e merge WIP
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
-rwxr-xr-xindra/newview/llviewerstats.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index fd2fb3695f..f60829e9e8 100755
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -639,7 +639,7 @@ void LLViewerStats::PhaseMap::startPhase(const std::string& phase_name)
{
LLTimer& timer = getPhaseTimer(phase_name);
timer.start();
- //LL_DEBUGS("Avatar") << "startPhase " << phase_name << llendl;
+ //LL_DEBUGS("Avatar") << "startPhase " << phase_name << LL_ENDL;
}
void LLViewerStats::PhaseMap::clearPhases()
@@ -711,11 +711,11 @@ bool LLViewerStats::PhaseMap::getPhaseValues(const std::string& phase_name, F32&
found = true;
elapsed = iter->second.getElapsedTimeF32();
completed = !iter->second.getStarted();
- //LL_DEBUGS("Avatar") << " phase_name " << phase_name << " elapsed " << elapsed << " completed " << completed << " timer addr " << (S32)(&iter->second) << llendl;
+ //LL_DEBUGS("Avatar") << " phase_name " << phase_name << " elapsed " << elapsed << " completed " << completed << " timer addr " << (S32)(&iter->second) << LL_ENDL;
}
else
{
- //LL_DEBUGS("Avatar") << " phase_name " << phase_name << " NOT FOUND" << llendl;
+ //LL_DEBUGS("Avatar") << " phase_name " << phase_name << " NOT FOUND" << LL_ENDL;
}
return found;