diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-19 18:46:58 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-19 18:46:58 -0400 |
| commit | d1fcd31aa9c7e4e00a4fe259cff083654c354bde (patch) | |
| tree | a415e1c99ebd1cd8a9bf54c62a50000c6c95e4ef /indra | |
| parent | 48b169dbc2b52017b47fc0bc87fb5fdfb2310f9d (diff) | |
| parent | 25a8ccd36427cb2e30dd140ac1fa1fa6639b5de4 (diff) | |
Merge
Diffstat (limited to 'indra')
| -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 { |