summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-03 16:52:40 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-03 16:52:40 -0500
commit8e7632552b8541a37cca6ae623140d70f74deaac (patch)
tree36a5698f471ebc65ff03fc993a13fd5409c3f737 /indra/llcommon/llfasttimer.h
parent2bc6e28e0e327ec4f56d005ece9fb6e394013968 (diff)
parentb9536434f7a09cb47fc2174056c85a80843edac5 (diff)
automated merge from mesh-development
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
-rwxr-xr-xindra/llcommon/llfasttimer.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index c177027f4e..2b25f2fabb 100755
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -27,7 +27,6 @@
#ifndef LL_FASTTIMER_H
#define LL_FASTTIMER_H
-// Temporarily(?) de-inlined these functions to simplify diagnosis of problems.
// Implementation of getCPUClockCount32() and getCPUClockCount64 are now in llfastertimer_class.cpp.
// pull in the actual class definition