summaryrefslogtreecommitdiff
path: root/indra/llcommon/llframetimer.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-12-02 14:57:29 -0800
committerRichard Linden <none@none>2013-12-02 14:57:29 -0800
commit34ff2fc46ba8c623f0eab8fe1dccb5db327775a8 (patch)
tree7bc422dd969e1d18e9d83e52a9a6dcfa2bd6139f /indra/llcommon/llframetimer.cpp
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
parentd8e92867162f8c4ff9489d8eefde53546e907dff (diff)
merge with release
Diffstat (limited to 'indra/llcommon/llframetimer.cpp')
-rwxr-xr-xindra/llcommon/llframetimer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp
index ec64195b21..1af2cb8afd 100755
--- a/indra/llcommon/llframetimer.cpp
+++ b/indra/llcommon/llframetimer.cpp
@@ -115,10 +115,10 @@ F64 LLFrameTimer::expiresAt() const
BOOL LLFrameTimer::checkExpirationAndReset(F32 expiration)
{
- //llinfos << "LLFrameTimer::checkExpirationAndReset()" << llendl;
- //llinfos << " mStartTime:" << mStartTime << llendl;
- //llinfos << " sFrameTime:" << sFrameTime << llendl;
- //llinfos << " mExpiry: " << mExpiry << llendl;
+ //LL_INFOS() << "LLFrameTimer::checkExpirationAndReset()" << LL_ENDL;
+ //LL_INFOS() << " mStartTime:" << mStartTime << LL_ENDL;
+ //LL_INFOS() << " sFrameTime:" << sFrameTime << LL_ENDL;
+ //LL_INFOS() << " mExpiry: " << mExpiry << LL_ENDL;
if(hasExpired())
{