diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-22 12:46:00 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-22 12:46:00 +0200 |
| commit | 8e50d02e1b9c2a051009df9f8ecf058e1cdb325d (patch) | |
| tree | 643669b40d6e72b8bdd4b8a5dffb44dc9e460362 /indra/newview/llvovolume.cpp | |
| parent | 92f33c185efe196d9d15989e2dc833f8d6013159 (diff) | |
| parent | 6e4f9b9073f735dd169f09f35811d14736b4cd0c (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 86d8204473..cb362d557c 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -962,8 +962,11 @@ void LLVOVolume::updateSculptTexture() if (isSculpted()) { LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); - LLUUID id = sculpt_params->getSculptTexture(); - mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + LLUUID id = sculpt_params->getSculptTexture(); + if (id.notNull()) + { + mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + } } else { |