diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-19 17:52:32 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-19 17:52:32 -0400 |
| commit | 11ddfa8bcee802b0c5808ab4fef2eba48e8fc47f (patch) | |
| tree | 09dccc3b486c77f48d5fb03c66789639cba8a5bd /indra | |
| parent | 564087f6b01b19b1efd2e0dee72e4bfa5d7fd9e7 (diff) | |
SH-2090 FIX - cherry pick from davep commit
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llvovolume.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 4723ec9bd1..367a3f5732 100644..100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1017,6 +1017,9 @@ 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) |