diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-27 12:44:00 -0800 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-27 12:44:00 -0800 |
| commit | 2c9636a9e5cb016d05741f214ac117dcae1ea317 (patch) | |
| tree | e0a32854fd9cd65d45b4aa6d2eb37bad7e78ed99 /indra/newview/llviewertexturelist.h | |
| parent | 34158130b4e7a24011132230765d873ea36b8986 (diff) | |
For MAINT-2003 Fix sequencing issue causing mem multiplier to be applied after clamping below actual mem available
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
| -rw-r--r-- | indra/newview/llviewertexturelist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index 3dda973d3f..88dea4448b 100644 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -114,7 +114,7 @@ public: void setDebugFetching(LLViewerFetchedTexture* tex, S32 debug_level); static S32 getMinVideoRamSetting(); - static S32 getMaxVideoRamSetting(bool get_recommended = false); + static S32 getMaxVideoRamSetting(bool get_recommended, float mem_multiplier); private: void updateImagesDecodePriorities(); |