diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-04 08:45:49 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-04 08:45:49 -0800 |
| commit | 53fb7f9998fceadc84ee3aefec12806ce87f7772 (patch) | |
| tree | d6b573858cda30f1191c45de1366af974233957d /indra/newview/llviewerregion.h | |
| parent | e79b1dfb418ad090c016eaa4d6b1388bde47c274 (diff) | |
| parent | 059b561dd2fbbc115d815a41d58b8bb76f603074 (diff) | |
merge storm-2082 changes
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 1e225553b8..fbe229e00f 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -431,7 +431,8 @@ public: static BOOL sVOCacheCullingEnabled; //vo cache culling enabled or not. static S32 sLastCameraUpdated; - LLFrameTimer & getRenderInfoRequestTimer() { return mRenderInfoRequestTimer; }; + LLFrameTimer & getRenderInfoRequestTimer() { return mRenderInfoRequestTimer; }; + LLFrameTimer & getRenderInfoReportTimer() { return mRenderInfoReportTimer; }; struct CompareRegionByLastUpdate { @@ -536,7 +537,8 @@ private: // the materials capability throttle LLFrameTimer mMaterialsCapThrottleTimer; -LLFrameTimer mRenderInfoRequestTimer; + LLFrameTimer mRenderInfoRequestTimer; + LLFrameTimer mRenderInfoReportTimer; }; inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const |