summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-20 16:59:41 -0500
committerDave Parks <davep@lindenlab.com>2010-03-20 16:59:41 -0500
commit8424ceb20f7baa6d5cf980d2b9ae92121d1dcb20 (patch)
treeeb691b2e04d91d0f994f1fc04acd066e4d474384 /indra/newview/llviewerobject.cpp
parent433996c2014d2f5ff5037d1fbb8bb5edbe818e1f (diff)
parent06e3d288e40e46204d84aed9c548a6ca529e78d8 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 6c8346df86..fdc63d5b76 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2932,7 +2932,7 @@ void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */)
getTEImage(i)->setBoostLevel(LLViewerTexture::BOOST_SELECTED);
}
- if (isSculpted())
+ if (isSculpted() && !isMesh())
{
LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
LLUUID sculpt_id = sculpt_params->getSculptTexture();