summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-05-25 08:12:47 -0700
committerGlenn Glazer <coyot@lindenlab.com>2016-05-25 08:12:47 -0700
commit67438c67aba96fe51dd29eee52bd332286dd2130 (patch)
tree5c10eacc151dfedcf0afcccd97da045169d5d704 /indra/newview/llviewerregion.h
parent9908fcf4ac43537728d1b34e30650735cfb36147 (diff)
parentfb598cd380b38714abed554b8feacabfc55b2aaa (diff)
pull from lynx
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rw-r--r--[-rwxr-xr-x]indra/newview/llviewerregion.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 8c4966369c..a7bb546d2c 100755..100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -433,7 +433,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
{
@@ -542,6 +543,7 @@ private:
// the materials capability throttle
LLFrameTimer mMaterialsCapThrottleTimer;
LLFrameTimer mRenderInfoRequestTimer;
+ LLFrameTimer mRenderInfoReportTimer;
};
inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const