diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-06 17:39:01 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-06 17:39:01 -0400 |
| commit | 5e5b140ed8a23bc6190ff3614948a62ef49311ad (patch) | |
| tree | 5c10f7180949779ac4145ceaf593f074dd63ecde /indra/newview | |
| parent | 5f17754a39c94c90be98313d52efab18e3cfc789 (diff) | |
| parent | 1a5f978ca8eab965e89783b0476d52be4c2b185c (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 6a12f4ce4f..93607f7a30 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3059,7 +3059,7 @@ U32 LLModelPreview::calcResourceCost() F32 z_length = z_transformed.normalize(); LLVector3 scale = LLVector3(x_length, y_length, z_length); - F32 radius = scale.length()*debug_scale; + F32 radius = scale.length()*0.5f*debug_scale; streaming_cost += LLMeshRepository::getStreamingCost(ret, radius); } diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index e6da8eb89d..4723ec9bd1 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3096,7 +3096,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()) { |