diff options
author | Dave Parks <davep@lindenlab.com> | 2022-02-24 13:05:07 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2022-02-24 13:05:07 -0600 |
commit | ba6ca8d45f63f91900be8232e71feb200335febf (patch) | |
tree | f0c66d765195a0fd804b8b2544c4d8dab7a81c74 /indra/newview/llviewerparcelmgr.cpp | |
parent | 658a30bd2e116149d3e6e6f937f9ad7f14983ce3 (diff) | |
parent | 21baea0907027c655c5170975c0ea669430c9c40 (diff) |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
-rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 56370df751..e69b0347f8 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -878,7 +878,7 @@ LLParcel* LLViewerParcelMgr::getCollisionParcel() const void LLViewerParcelMgr::render() { - if (mSelected && mRenderSelection && gSavedSettings.getBOOL("RenderParcelSelection")) + if (mSelected && mRenderSelection && gSavedSettings.getBOOL("RenderParcelSelection") && !gDisconnected) { // Rendering is done in agent-coordinates, so need to supply // an appropriate offset to the render code. |