diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 4 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 4 | ||||
| -rw-r--r-- | indra/newview/SignBundle.cmake.in | 2 | ||||
| -rw-r--r-- | indra/newview/SignPackage.cmake.in | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
7 files changed, 9 insertions, 10 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index cc8e3ddea3..c68ba0001c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1786,8 +1786,7 @@ set(PACKAGE ON CACHE BOOL if (PACKAGE) set(CPACK_PACKAGE_NAME ${VIEWER_BINARY_NAME} CACHE STRING "Viewer binary name.") - set(CPACK_PACKAGE_VERSION ${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION} - CACHE STRING "Viewer major.minor.patch.revision versions.") + set(CPACK_PACKAGE_VERSION ${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}) set(VIEWER_PACKAGE_COMMENT "A fork of the Second Life viewer") set(VIEWER_PACKAGE_DESCRIPTION "An entrance to virtual empires in only megabytes. A shelter for the metaverse refugees, especially those from less supported operating systems.") string(TOLOWER ${VIEWER_BINARY_NAME} DOMAIN_NAME) diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 1d4192c94c..6a73ab4f61 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -158,9 +158,9 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libexpat.1.12.2.dylib + COMMAND lipo libexpat.1.12.3.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.12.2.dylib + -output libexpat.1.12.3.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 26fd3ccff7..cb31a1a39d 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -158,9 +158,9 @@ execute_process( COMMAND lipo libbz2.1.0.8.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libbz2.1.0.8.dylib - COMMAND lipo libexpat.1.12.2.dylib + COMMAND lipo libexpat.1.12.3.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libexpat.1.12.2.dylib + -output libexpat.1.12.3.dylib COMMAND lipo libfreetype.6.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libfreetype.6.dylib diff --git a/indra/newview/SignBundle.cmake.in b/indra/newview/SignBundle.cmake.in index eb6ea1a35d..eacc24af67 100644 --- a/indra/newview/SignBundle.cmake.in +++ b/indra/newview/SignBundle.cmake.in @@ -22,7 +22,7 @@ execute_process( Frameworks/libbrotlidec.1.2.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib - Frameworks/libexpat.1.12.2.dylib + Frameworks/libexpat.1.12.3.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib Frameworks/libiconv.2.dylib diff --git a/indra/newview/SignPackage.cmake.in b/indra/newview/SignPackage.cmake.in index 9b5be4a7fd..090891a870 100644 --- a/indra/newview/SignPackage.cmake.in +++ b/indra/newview/SignPackage.cmake.in @@ -22,7 +22,7 @@ execute_process( Frameworks/libbrotlidec.1.2.0.dylib Frameworks/libbz2.1.0.8.dylib Frameworks/libdiscord_partner_sdk.dylib - Frameworks/libexpat.1.12.2.dylib + Frameworks/libexpat.1.12.3.dylib Frameworks/libfreetype.6.dylib Frameworks/libhunspell-1.7.0.dylib Frameworks/libiconv.2.dylib diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 440c72c561..f2ea34f0d6 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -161,7 +161,7 @@ elseif (WINDOWS) get_filename_component(_boost_context_dll_name "${_boost_context_dll}" NAME_WE) string(REPLACE "boost_context" "" BOOST_DLL_SFX "${_boost_context_dll_name}") else () - set(BOOST_DLL_SFX -vc143-mt-${BOOST_PLATFORM}-1_91) + set(BOOST_DLL_SFX -vc145-mt-${BOOST_PLATFORM}-1_92) message(WARNING "Could not detect Boost DLL suffix via glob; using fallback '${BOOST_DLL_SFX}'.") endif () diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4d15126271..9b8e42ef09 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6498,7 +6498,7 @@ bool LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset) { auto name = (*iter)->getName(); auto colon = name.find_first_of(':'); - if (name == action || colon != std::string::npos && !name.compare(0, colon, action)) + if (name == action || (colon != std::string::npos && !name.compare(0, colon, action))) { folderID = findDescendentCategoryIDByName(folderID, name); gInventory.getDirectDescendentsOf(folderID, cats, items); |