summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt3
-rw-r--r--indra/newview/llvovolume.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 55a2fb7630..db2712f4f2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1498,6 +1498,9 @@ if (WINDOWS)
${SHARED_LIB_STAGING_DIR}/Release/glod.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/glod.dll
${SHARED_LIB_STAGING_DIR}/Debug/glod.dll
+ ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom21.dll
+ ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom21.dll
+ ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom21-d.dll
${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll
${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index bf34349995..e7e2830f25 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3207,7 +3207,7 @@ F32 LLVOVolume::getStreamingCost()
{
const LLSD& header = gMeshRepo.getMeshHeader(getVolume()->getParams().getSculptID());
- F32 radius = getRadius();
+ F32 radius = getScale().length();
return LLMeshRepository::getStreamingCost(header, radius);
}