diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-19 23:48:11 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-19 23:48:11 -0600 |
| commit | 83e48f4a5100ab1adadc27a3e7a0b23b68b8b568 (patch) | |
| tree | 68a2b81442389d1f9e54bce3dca5bc0e47b7a3e6 /indra/newview/pipeline.h | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
| parent | 76eca5d0bce3e303f6d77b0d16f114320830ac6a (diff) | |
Merge
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index e9da25e544..7f76211f1c 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -360,6 +360,8 @@ public: static void updateRenderDeferred(); static void refreshRenderDeferred(); + static void throttleNewMemoryAllocation(BOOL disable); + void addDebugBlip(const LLVector3& position, const LLColor4& color); private: @@ -515,8 +517,9 @@ public: static BOOL sRenderAttachedLights; static BOOL sRenderAttachedParticles; static BOOL sRenderDeferred; + static BOOL sMemAllocationThrottled; static S32 sVisibleLightCount; - static F32 sMinRenderSize; + static F32 sMinRenderSize; //screen texture U32 mScreenWidth; |