From e2ddeb5e5f23b360397e5ca1e8bdcf165245df9e Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Tue, 5 Jul 2011 13:27:58 -0400
Subject: Fix for SH-1604: missing convex stub license

---
 autobuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>
-- 
cgit v1.2.3


From 1a5f978ca8eab965e89783b0476d52be4c2b185c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 6 Jul 2011 12:32:44 -0500
Subject: SH-1988 Fix for using diameter instead of radius for streaming cost.

---
 indra/newview/llfloatermodelpreview.cpp | 2 +-
 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 14f8ccb625..7d4059f50e 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -3013,7 +3013,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())
 	{	
-- 
cgit v1.2.3