diff options
| author | Richard Linden <none@none> | 2013-06-18 23:42:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-18 23:42:59 -0700 |
| commit | 8977f43230bda6d7f814e770ba574d016a3875fa (patch) | |
| tree | 16b30705c490a250893699c486e63d4d97c0003f /indra/newview/llappviewer.cpp | |
| parent | 1bc1d532cff1539bb5366f87b602970f1d2a8929 (diff) | |
| parent | d136c4c29686c565b5a46503aa67a9c958b4145d (diff) | |
Automated merge with bundle:d:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.7jrj8n\https__bitbucket.org_lindenlab_viewer-interesting_jch9cd.hg
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 42bf9b657b..ef24ba21ee 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -296,7 +296,7 @@ LLPumpIO* gServicePump = NULL; U64 gFrameTime = 0; F32 gFrameTimeSeconds = 0.f; -LLUnit<LLUnits::Seconds, F32> gFrameIntervalSeconds = 0.f; +LLUnit<F32, LLUnits::Seconds> gFrameIntervalSeconds = 0.f; F32 gFPSClamped = 10.f; // Pretend we start at target rate. F32 gFrameDTClamped = 0.f; // Time between adjacent checks to network for packets U64 gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds |