diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-18 18:24:16 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-18 18:24:16 -0700 |
| commit | 95e34d86b9d86b3b3c7d3c39620e35b06f8fa9cf (patch) | |
| tree | 5a2652bef97f1bb2d76c0b86482cebe2b2505a79 /indra/newview/llviewerregion.h | |
| parent | 93503a05ec905ef2a8df39802fdc3475c961f3bc (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
The unbearable lightness of being norspec
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index e2cc95f232..8f8bfa23c1 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -43,6 +43,7 @@ #include "llcapabilityprovider.h" #include "m4math.h" // LLMatrix4 #include "llhttpclient.h" +#include "llframetimer.h" // Surface id's #define LAND 1 @@ -343,6 +344,11 @@ public: const LLViewerRegionImpl * getRegionImpl() const { return mImpl; } LLViewerRegionImpl * getRegionImplNC() { return mImpl; } + // implements the materials capability throttle + bool materialsCapThrottled() const { return !mMaterialsCapThrottleTimer.hasExpired(); } + void resetMaterialsCapThrottle(); + + U32 getMaxMaterialsPerTransaction() const; public: struct CompareDistance { @@ -437,7 +443,9 @@ private: LLSD mSimulatorFeatures; - LLFrameTimer mRenderInfoRequestTimer; + // the materials capability throttle + LLFrameTimer mMaterialsCapThrottleTimer; +LLFrameTimer mRenderInfoRequestTimer; }; inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const |