summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmgr.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2025-12-12 11:57:07 -0800
committerGitHub <noreply@github.com>2025-12-12 11:57:07 -0800
commit24bb1e58f87bbc42ec006d1eb107091c709b6de3 (patch)
tree99031882ec6fd39473d8b67f5cb06f8d38d8be2f /indra/newview/llviewerparcelmgr.cpp
parent43341b7aa9c883066c6d31da929cc30732da66f9 (diff)
parentf4eec813a3043e2277ae62da6a829c65887d0785 (diff)
Merge branch 'develop' into rider/privileged_land
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
-rw-r--r--indra/newview/llviewerparcelmgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 432da2e990..6a029645fb 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -881,7 +881,8 @@ LLParcel* LLViewerParcelMgr::getCollisionParcel() const
void LLViewerParcelMgr::render()
{
- if (mSelected && mRenderSelection && gSavedSettings.getBOOL("RenderParcelSelection") && !gDisconnected)
+ static LLCachedControl<bool> render_parcel_selection(gSavedSettings, "RenderParcelSelection");
+ if (mSelected && mRenderSelection && render_parcel_selection() && !gDisconnected)
{
// Rendering is done in agent-coordinates, so need to supply
// an appropriate offset to the render code.