diff options
| author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
| commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
| tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/llviewerimage.cpp | |
| parent | Second Life viewer sources 1.18.2.1 (diff) | |
| download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz | |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to 'linden/indra/newview/llviewerimage.cpp')
| -rw-r--r-- | linden/indra/newview/llviewerimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp index e40fb80..f4cd582 100644 --- a/linden/indra/newview/llviewerimage.cpp +++ b/linden/indra/newview/llviewerimage.cpp | |||
| @@ -155,9 +155,9 @@ void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity) | |||
| 155 | sMaxTotalTextureMem -= sMaxBoundTextureMem/4; | 155 | sMaxTotalTextureMem -= sMaxBoundTextureMem/4; |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | if ((U32)sMaxTotalTextureMem > gSysMemory.getPhysicalMemory() - (U32)min_non_tex_system_mem) | 158 | if ((U32)sMaxTotalTextureMem > gSysMemory.getPhysicalMemoryClamped() - (U32)min_non_tex_system_mem) |
| 159 | { | 159 | { |
| 160 | sMaxTotalTextureMem = (S32)gSysMemory.getPhysicalMemory() - min_non_tex_system_mem; | 160 | sMaxTotalTextureMem = (S32)gSysMemory.getPhysicalMemoryClamped() - min_non_tex_system_mem; |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | if (sBoundTextureMemory >= sMaxBoundTextureMem || | 163 | if (sBoundTextureMemory >= sMaxBoundTextureMem || |