diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-05-22 12:38:45 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-05-22 15:39:53 +0300 |
| commit | 47985e5822ce9fdebb7443e13b3c1a781a842ecd (patch) | |
| tree | 2945dfbaa79eae04e96776eff48192d04d7cd6f0 | |
| parent | 6d6eabca44d08d5b97bfe3e941d2b9687c2246ea (diff) | |
triage#59 Fix missed 'static' declarations
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
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<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()) @@ -732,7 +732,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) return; } - LLCachedControl<bool> friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false); + 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 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<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)) { |