diff options
| author | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
| commit | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (patch) | |
| tree | 43935b338c5a87ca32f9240389470a96271fa1f5 /indra/newview/llvovolume.cpp | |
| parent | 8b09dfb8907c364f09ee82d00926219ae52b5ee9 (diff) | |
| parent | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (diff) | |
Automated merge with file:///e:\code\viewer-experience
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 4c137d3394..30216f02db 100644 --- 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) @@ -3096,7 +3099,7 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const F32 LLVOVolume::getStreamingCost(S32* bytes, S32* visible_bytes) { - F32 radius = getScale().length(); + F32 radius = getScale().length()*0.5f; if (isMesh()) { |