diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 7 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 7d227d3674..14c54d72ef 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -38,7 +38,7 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll - libcollada14dom21.dll + libcollada14dom21-d.dll glod.dll ) diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 9f8d99a0bf..fae1ef2a51 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -13,7 +13,12 @@ set(LLPRIMITIVE_INCLUDE_DIRS if (WINDOWS) set(LLPRIMITIVE_LIBRARIES llprimitive - libcollada14dom21 + debug libcollada14dom21-d + debug libboost_filesystem-d + debug libboost_system-d + optimized libcollada14dom21 + optimized libboost_filesystem + optimized libboost_system ) else (WINDOWS) set(LLPRIMITIVE_LIBRARIES 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); } |