From 4215c2d49f3a1154b8525ebe0dafb6ec238cace9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 21 May 2024 12:45:42 -0400 Subject: Change 'LLPredicate::Rule::requires()' to 'mandates()' for C++20. Although 'requires' appears in many comments and some string literals, and 'concept' in a few of each, LLPredicate::Rule appears to be the only use of any new C++20 reserved word in the existing code base. And it seems to be unreferenced. --- indra/llcommon/llpredicate.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra') diff --git a/indra/llcommon/llpredicate.h b/indra/llcommon/llpredicate.h index e6c56a5711..205f08421f 100644 --- a/indra/llcommon/llpredicate.h +++ b/indra/llcommon/llpredicate.h @@ -139,10 +139,10 @@ namespace LLPredicate Rule() {} - void require(ENUM e, bool match) - { - mRule.set(e, match); - } + void mandate(ENUM e, bool match) + { + mRule.set(e, match); + } void allow(ENUM e) { @@ -154,10 +154,10 @@ namespace LLPredicate return (mRule && value).someSet(); } - bool requires(const Value value) const - { - return (mRule && value).someSet() && (!mRule && value).noneSet(); - } + bool mandates(const Value value) const + { + return (mRule && value).someSet() && (!mRule && value).noneSet(); + } bool isAmbivalent(const Value value) const { -- cgit v1.2.3 From 47985e5822ce9fdebb7443e13b3c1a781a842ecd Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 22 May 2024 12:38:45 +0300 Subject: triage#59 Fix missed 'static' declarations --- indra/newview/lldrawpoolavatar.cpp | 6 +++--- indra/newview/llinventorybridge.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'indra') diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index a07827d395..72e6945679 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -370,8 +370,8 @@ void LLDrawPoolAvatar::renderShadow(S32 pass) return; } - LLCachedControl debug_invisible(gSavedSettings, "RenderAvatarFriendsOnly", false); - if (debug_invisible() + static LLCachedControl friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false); + if (friends_only() && !avatarp->isControlAvatar() && !avatarp->isSelf() && !avatarp->isBuddy()) @@ -732,7 +732,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) return; } - LLCachedControl friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false); + static LLCachedControl friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false); if (!single_avatar && friends_only() && !avatarp->isUIAvatar() diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 909b7b01ea..075c11f86f 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1190,8 +1190,8 @@ void LLInvFVBridge::addMarketplaceContextMenuOptions(U32 flags, LLInventoryModel::cat_array_t categories; LLInventoryModel::item_array_t items; gInventory.collectDescendents(local_version_folder_id, categories, items, false); - LLCachedControl max_depth(gSavedSettings, "InventoryOutboxMaxFolderDepth", 4); - LLCachedControl max_count(gSavedSettings, "InventoryOutboxMaxFolderCount", 20); + static LLCachedControl max_depth(gSavedSettings, "InventoryOutboxMaxFolderDepth", 4); + static LLCachedControl max_count(gSavedSettings, "InventoryOutboxMaxFolderCount", 20); if (categories.size() >= max_count || depth > (max_depth + 1)) { -- cgit v1.2.3 From f8ccb39b8d944f9d2bf4308f909273cd5a35cbe7 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 22 May 2024 09:26:05 -0400 Subject: Bring over .xz compression from main, instead of .bz2. The main branch, and the current rev of viewer-build-util, consistently uses .xz for tarballs. --- indra/newview/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3eb3fadbf1..0630a353ed 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1800,7 +1800,7 @@ if (WINDOWS) if (PACKAGE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2 + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py @@ -1843,7 +1843,7 @@ if (WINDOWS) ) # temporarily disable packaging of event_host until hg subrepos get # sorted out on the parabuild cluster... - #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2) + #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz) endif (PACKAGE) elseif (DARWIN) @@ -1963,7 +1963,7 @@ if (LINUX) #endif (NOT USE_BUGSPLAT) add_custom_command( - OUTPUT ${product}.tar.bz2 + OUTPUT ${product}.tar.xz COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py @@ -2015,7 +2015,7 @@ if (LINUX) add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched) if (PACKAGE) - add_custom_target(llpackage ALL DEPENDS ${product}.tar.bz2) + add_custom_target(llpackage ALL DEPENDS ${product}.tar.xz) # Make sure we don't run two instances of viewer_manifest.py at the same time. add_dependencies(llpackage copy_l_viewer_manifest) check_message_template(llpackage) @@ -2144,12 +2144,12 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE OUTPUT_VARIABLE PARENT_DIRECTORY_CYGWIN OUTPUT_STRIP_TRAILING_WHITESPACE) add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" - # Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.bz2; + # Use of 'tar ...J' here assumes VIEWER_SYMBOL_FILE endswith .tar.xz; # testing a string suffix is painful enough in CMake language that # we'll continue assuming it until forced to generalize. COMMAND "tar" ARGS - "cjf" + "cJf" "${VIEWER_SYMBOL_FILE_CYGWIN}" "-C" "${PARENT_DIRECTORY_CYGWIN}" -- cgit v1.2.3