diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
| commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
| tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/llcommon/lltimer.cpp | |
| parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
| parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) | |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/llcommon/lltimer.cpp')
| -rwxr-xr-x | indra/llcommon/lltimer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index ab105a82e6..76e892212a 100755 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -39,14 +39,10 @@ # error "architecture not supported" #endif - // // Locally used constants // -const F64 SEC_TO_MICROSEC = 1000000.f; const U64 SEC_TO_MICROSEC_U64 = 1000000; -const F64 USEC_TO_SEC_F64 = 0.000001; - //--------------------------------------------------------------------------- // Globals and statics |