diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-03-19 00:03:19 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-03-19 00:03:42 +0200 |
| commit | 969ed536806dce1fe2fa8fc9b312f1c80e671d84 (patch) | |
| tree | 3e8c7e74cbecf7aefe250b03a72651dd781bf8ed /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | f462037b8e3474115a1f039ce0cd56c98e320227 (diff) | |
| parent | c99e3167ed8549bc13d7df03b1e12dc15b0a080f (diff) | |
Merge branch 'release/2025.03' into release/2025.04
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index b8c12ce0b9..b00b9d1ad1 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -294,7 +294,7 @@ void LLPanelPrimMediaControls::updateShape() LLViewerMediaImpl* media_impl = getTargetMediaImpl(); LLViewerObject* objectp = getTargetObject(); - if(!media_impl || gFloaterTools->getVisible()) + if(!media_impl || (gFloaterTools && gFloaterTools->getVisible())) { setVisible(false); return; |