diff options
| author | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
| commit | 88e455a3a536bae39a0c83ae9bc43cc1252ed4c0 (patch) | |
| tree | 58f4ce4cd3396c1b13b430744ce3e91ce0fa28b2 /indra/newview/llworld.cpp | |
| parent | d48889198b9f5b39c195e237ae253339b2d89ef3 (diff) | |
| parent | aaac4c7df5858a2dfc385b195446476947244dad (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 09d17b3701..43152c9025 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1157,7 +1157,7 @@ void send_agent_resume() } // Reset the FPS counter to avoid an invalid fps - LLViewerStats::getInstance()->mFPSStat.start(); + LLViewerStats::getInstance()->mFPSStat.reset(); LLAppViewer::instance()->resumeMainloopTimeout(); } |