diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-01-07 19:24:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-07 19:24:11 +0200 |
| commit | 1cf375c89adfae557b18dadfb267659b6fb0a8ce (patch) | |
| tree | 77c9f59277aad29cf00dd2de00d97c1909f9f59e /indra/newview/llviewerparcelmgr.cpp | |
| parent | 516bd5e832a91e1f837b5b1b621cfac5fe71c08f (diff) | |
| parent | cab31f8bfed507425a09b266d47823f6acddfa94 (diff) | |
Merge pull request #5227 from RyeMutt/rye/devmerge
Sync develop-linux with develop
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
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. |