diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-17 11:29:16 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-17 11:29:16 -0600 |
| commit | de88d6ced487fd55fa6f6bb860849979f031a363 (patch) | |
| tree | 6d0f6f996a5923c3f6fa4cad27367ac1d0d53801 /indra/newview/llvovolume.cpp | |
| parent | ffcbbf4aaabc652c2050ca6147a9388217cfcaa7 (diff) | |
Switched program database on windows to edit and continue for non-release builds.
Adding a debug watch to LLCurlRequest to avoid invalidating iterator on processing posts.
Mesh bulk uploading rewrite work in progress.
404 icons for mesh assets.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index fb28b78daf..cb67890515 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -920,6 +920,8 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms, const S32 detail, bool S32 lod = mLOD; + BOOL is404 = FALSE; + if (isSculpted()) { // if it's a mesh @@ -932,6 +934,11 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms, const S32 detail, bool volume_params.setType(LL_PCODE_PROFILE_SQUARE, LL_PCODE_PATH_LINE); lod = gMeshRepo.getActualMeshLOD(volume_params, lod); + if (lod == -1) + { + is404 = TRUE; + lod = 0; + } } } @@ -962,7 +969,10 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms, const S32 detail, bool } } - + if (is404) + { + setIcon(LLViewerTextureManager::getFetchedTextureFromFile("icons/Inv_Mesh.png", TRUE, LLViewerTexture::BOOST_UI)); + } if ((LLPrimitive::setVolume(volume_params, lod, (mVolumeImpl && mVolumeImpl->isVolumeUnique()))) || mSculptChanged) { @@ -995,10 +1005,9 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms, const S32 detail, bool } else // otherwise is sculptie { - if (mSculptTexture.notNull()) { - sculpt(); + sculpt(); } } } |