summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-28 13:29:11 -0400
committerOz Linden <oz@lindenlab.com>2013-06-28 13:29:11 -0400
commit5f397fa58352fb58d79b72148904f925416f4978 (patch)
tree96d35a660b4cd9227a51d7cc92f642a31ce01c23 /indra/newview/llviewerregion.h
parent743b6ca6177f46d7d7f964993ee226ef6706d408 (diff)
NORSPEC-206: read RenderMaterialsCapability throttle rate per second from simulator
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rwxr-xr-xindra/newview/llviewerregion.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 031159183b..a3db7f5ac7 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
@@ -342,6 +343,10 @@ public:
void getNeighboringRegionsStatus( std::vector<S32>& regions );
const LLViewerRegionImpl * getRegionImpl() const { return mImpl; }
LLViewerRegionImpl * getRegionImplNC() { return mImpl; }
+
+ // implements the materials capability throttle
+ bool materialsCapThrottled() const { return !mMaterialsCapThrottleTimer.hasExpired(); }
+ void resetMaterialsCapThrottle();
public:
struct CompareDistance
@@ -434,6 +439,9 @@ private:
BOOL mReleaseNotesRequested;
LLSD mSimulatorFeatures;
+
+ // the materials capability throttle
+ LLFrameTimer mMaterialsCapThrottleTimer;
};
inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const