diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-09-09 14:51:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-09-09 14:51:34 -0400 |
| commit | c4b070ae0011a0c2aa8dd3d01c5f3ad3ecbd3ec3 (patch) | |
| tree | d9da12a63dad133b557ff14972844e21dee8dc34 /indra/newview/llviewertexturelist.h | |
| parent | 8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
merge changes for 3.6.5-release
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
| -rwxr-xr-x | 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 136042620d..26dc6dcbe2 100755 --- 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(); |