diff options
author | Jacek Antonelli | 2010-02-09 21:11:42 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-16 18:50:15 -0600 |
commit | e6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch) | |
tree | 10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/newview/llviewerobject.cpp | |
parent | Ported some cURL and HTTP-related changes from Snowglobe. (diff) | |
download | meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2 meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz |
Ported many texture engine changes from Snowglobe.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp index 51908a5..860052c 100644 --- a/linden/indra/newview/llviewerobject.cpp +++ b/linden/indra/newview/llviewerobject.cpp | |||
@@ -2900,7 +2900,7 @@ F32 LLViewerObject::getMidScale() const | |||
2900 | } | 2900 | } |
2901 | 2901 | ||
2902 | 2902 | ||
2903 | void LLViewerObject::updateTextures(LLAgent &agent) | 2903 | void LLViewerObject::updateTextures() |
2904 | { | 2904 | { |
2905 | } | 2905 | } |
2906 | 2906 | ||
@@ -2915,14 +2915,14 @@ void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */) | |||
2915 | S32 tex_count = getNumTEs(); | 2915 | S32 tex_count = getNumTEs(); |
2916 | for (i = 0; i < tex_count; i++) | 2916 | for (i = 0; i < tex_count; i++) |
2917 | { | 2917 | { |
2918 | getTEImage(i)->setBoostLevel(LLViewerImage::BOOST_SELECTED); | 2918 | getTEImage(i)->setBoostLevel(LLViewerImageBoostLevel::BOOST_SELECTED); |
2919 | } | 2919 | } |
2920 | 2920 | ||
2921 | if (isSculpted()) | 2921 | if (isSculpted()) |
2922 | { | 2922 | { |
2923 | LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); | 2923 | LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); |
2924 | LLUUID sculpt_id = sculpt_params->getSculptTexture(); | 2924 | LLUUID sculpt_id = sculpt_params->getSculptTexture(); |
2925 | gImageList.getImage(sculpt_id)->setBoostLevel(LLViewerImage::BOOST_SELECTED); | 2925 | gImageList.getImage(sculpt_id)->setBoostLevel(LLViewerImageBoostLevel::BOOST_SELECTED); |
2926 | } | 2926 | } |
2927 | 2927 | ||
2928 | if (boost_children) | 2928 | if (boost_children) |