diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-15 17:07:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-15 17:07:10 -0400 |
| commit | 97106c2dea855e7a7a6378e0b6971d7a8226f1f6 (patch) | |
| tree | b1cc26bc18f8ec28fba94e0f91035bfb73d96452 /indra/newview/llvovolume.cpp | |
| parent | 981190cf3151f436d370b841b1baa5a2a607b94d (diff) | |
| parent | f2eef652063f7f2aee7296ff41cf5d34272cc12b (diff) | |
merge changes for DRTVWR-194
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 958282f1eb..9c36cfee59 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -822,7 +822,7 @@ void LLVOVolume::updateTextureVirtualSize(bool forced) } } - S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture + S32 texture_discard = mSculptTexture->getCachedRawImageLevel(); //try to match the texture S32 current_discard = getVolume() ? getVolume()->getSculptLevel() : -2 ; if (texture_discard >= 0 && //texture has some data available @@ -1128,7 +1128,7 @@ void LLVOVolume::sculpt() S8 sculpt_components = 0; const U8* sculpt_data = NULL; - S32 discard_level = mSculptTexture->getDiscardLevel() ; + S32 discard_level = mSculptTexture->getCachedRawImageLevel() ; LLImageRaw* raw_image = mSculptTexture->getCachedRawImage() ; S32 max_discard = mSculptTexture->getMaxDiscardLevel(); |
