diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
commit | 3d2378f1020060a84ab0b9ae23507077b7a0e7c1 (patch) | |
tree | 448bc57cf16514ef602602feff45ec4583d18608 /indra/newview/llvovolume.cpp | |
parent | f094d4f7529c27233f5ca228bda21deb9b864f1a (diff) | |
parent | ebb55355ebbe6ec6760d8683e461903957ed24e5 (diff) |
merge from viewer-pre-release
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rwxr-xr-x[-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..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) @@ -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()) { |