diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-19 14:18:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-19 14:18:03 -0500 |
| commit | 41635a8dfda707d86acb6f38d39a699758d40a8e (patch) | |
| tree | 0005251d61d8c0b07cfbf1210a56b902c25cea03 /indra/newview/llvovolume.cpp | |
| parent | 7ef1550fbb01acfb0cba0e849f1933462612784a (diff) | |
SH-2090 Make meshes that fail to load render as prim proxy.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 4723ec9bd1..a620244fab 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -966,7 +966,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo S32 lod = mLOD; BOOL is404 = FALSE; - + if (isSculpted()) { // if it's a mesh @@ -1017,6 +1017,8 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo if (is404) { setIcon(LLViewerTextureManager::getFetchedTextureFromFile("icons/Inv_Mesh.png", TRUE, LLViewerTexture::BOOST_UI)); + //render prim proxy when mesh loading attempts give up + volume_params.setSculptID(LLUUID::null, LL_SCULPT_TYPE_NONE); } if ((LLPrimitive::setVolume(volume_params, lod, (mVolumeImpl && mVolumeImpl->isVolumeUnique()))) || mSculptChanged) |