summaryrefslogtreecommitdiff
path: root/indra/llcommon/lltimer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-03 15:36:34 -0500
committerOz Linden <oz@lindenlab.com>2014-03-03 15:36:34 -0500
commita5e56067c28298b4df0ef498303f78f67c35782c (patch)
treeec5cf26d0eb8825a6d30fcf325e4862ddc353890 /indra/llcommon/lltimer.h
parent197db4976ad8df958b7b2c59a66498398cfd0665 (diff)
parentde8fea13627cc5978b8a6135802a52864a11c39a (diff)
merge changes for 3.7.2-release
Diffstat (limited to 'indra/llcommon/lltimer.h')
-rwxr-xr-xindra/llcommon/lltimer.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index 513de0605d..e73741217c 100755
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -146,6 +146,13 @@ static inline time_t time_max()
}
}
+// These are really statics but they've been global for awhile
+// and they're material to other timing classes. If you are
+// not implementing a timer class, do not use these directly.
+extern LL_COMMON_API F64 gClockFrequency;
+extern LL_COMMON_API F64 gClockFrequencyInv;
+extern LL_COMMON_API F64 gClocksToMicroseconds;
+
// Correction factor used by time_corrected() above.
extern LL_COMMON_API S32 gUTCOffset;