diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llviewerimage.cpp | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llviewerimage.cpp')
-rw-r--r-- | linden/indra/newview/llviewerimage.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp index c771791..7cac905 100644 --- a/linden/indra/newview/llviewerimage.cpp +++ b/linden/indra/newview/llviewerimage.cpp | |||
@@ -188,6 +188,12 @@ void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity) | |||
188 | sDesiredDiscardBias = llclamp(sDesiredDiscardBias, sDesiredDiscardBiasMin, sDesiredDiscardBiasMax); | 188 | sDesiredDiscardBias = llclamp(sDesiredDiscardBias, sDesiredDiscardBiasMin, sDesiredDiscardBiasMax); |
189 | } | 189 | } |
190 | 190 | ||
191 | // static | ||
192 | LLViewerImage* LLViewerImage::getImage(const LLUUID& image_id) | ||
193 | { | ||
194 | return gImageList.getImage(image_id); | ||
195 | } | ||
196 | |||
191 | //---------------------------------------------------------------------------- | 197 | //---------------------------------------------------------------------------- |
192 | 198 | ||
193 | const U32 LLViewerImage::sCurrentFileVersion = 1; | 199 | const U32 LLViewerImage::sCurrentFileVersion = 1; |
@@ -417,7 +423,7 @@ void LLViewerImage::resetTextureStats(BOOL zero) | |||
417 | mMaxVirtualSize = 0.0f; | 423 | mMaxVirtualSize = 0.0f; |
418 | mMaxCosAngle = -1.0f; | 424 | mMaxCosAngle = -1.0f; |
419 | } | 425 | } |
420 | else | 426 | else if (getBoostLevel() != LLViewerImage::BOOST_SCULPTED) //don't decay sculpted prim textures |
421 | { | 427 | { |
422 | mMaxVirtualSize -= mMaxVirtualSize * .10f; // decay by 5%/update | 428 | mMaxVirtualSize -= mMaxVirtualSize * .10f; // decay by 5%/update |
423 | mMaxCosAngle = -1.0f; | 429 | mMaxCosAngle = -1.0f; |