summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-05-22 19:08:15 +0200
committerAnsariel <ansariel.hiller@phoenixviewer.com>2024-05-22 19:08:15 +0200
commit7bb5afc11ee5a6af78302a8d76a9a619e2baaab2 (patch)
treefab23811a5cedc1ebf01479c852ee92ff62b636c /indra/newview
parent1b67dd855c41f5a0cda7ec2a68d98071986ca703 (diff)
parentef8f4819822288e044ea719feb6af7a1f4df4c4e (diff)
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts: # indra/llcommon/llpredicate.h # indra/newview/lldrawpoolavatar.cpp # indra/newview/llinventorybridge.cpp
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt2
-rw-r--r--indra/newview/lldrawpoolavatar.cpp24
-rw-r--r--indra/newview/llinventorybridge.cpp4
3 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0bd16bd8ef..90a4409ce3 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2128,7 +2128,7 @@ 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.xz;
+ # 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"
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index f3304a2864..0f395df276 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -370,8 +370,8 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
return;
}
- LLCachedControl<bool> debug_invisible(gSavedSettings, "RenderAvatarFriendsOnly", false);
- if (debug_invisible()
+ static LLCachedControl<bool> friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false);
+ if (friends_only()
&& !avatarp->isControlAvatar()
&& !avatarp->isSelf()
&& !avatarp->isBuddy())
@@ -723,16 +723,16 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
(F32)(pos.mV[VZ]));
gGL.scalef(0.15f, 0.15f, 0.3f);
- gSphere.renderGGL();
-
- gGL.popMatrix();
- gGL.setColorMask(true, false);
- }
- // don't render please
- return;
- }
-
- LLCachedControl<bool> friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false);
+ gSphere.renderGGL();
+
+ gGL.popMatrix();
+ gGL.setColorMask(true, false);
+ }
+ // don't render please
+ return;
+ }
+
+ static LLCachedControl<bool> 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 d29bcdaa2c..4eb2873e62 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1188,8 +1188,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<U32> max_depth(gSavedSettings, "InventoryOutboxMaxFolderDepth", 4);
- LLCachedControl<U32> max_count(gSavedSettings, "InventoryOutboxMaxFolderCount", 20);
+ static LLCachedControl<U32> max_depth(gSavedSettings, "InventoryOutboxMaxFolderDepth", 4);
+ static LLCachedControl<U32> max_count(gSavedSettings, "InventoryOutboxMaxFolderCount", 20);
if (categories.size() >= max_count
|| depth > (max_depth + 1))
{