diff options
| -rw-r--r-- | autobuild.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml index 084fe2f2f4..083bd1b011 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1148,7 +1148,7 @@ <key>license</key> <string>lgpl</string> <key>license_file</key> - <string>LICENSES/lgpl.txt</string> + <string>LICENSES/LLConvexDecompositionStubLicense.txt</string> <key>name</key> <string>llconvexdecompositionstub</string> <key>platforms</key> 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()) { |