diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-10-10 13:54:41 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-10-10 13:54:41 -0400 |
| commit | bab2137c12273777fcf7c176d1d4f385bf032887 (patch) | |
| tree | 762081b64b39e127b20ae39889f08bf369d31be3 /indra/newview/llsettingspicker.cpp | |
| parent | 0b7bc35131ce4a526c1e696904c4e8332e1b0fe9 (diff) | |
| parent | 3445a0199008a10a28c0abb75ab06aee908eacbb (diff) | |
Merge branch 'develop' into geenz/2025.07-lua-editor
Diffstat (limited to 'indra/newview/llsettingspicker.cpp')
| -rw-r--r-- | indra/newview/llsettingspicker.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp index 619882dc5e..5fc39b0dd8 100644 --- a/indra/newview/llsettingspicker.cpp +++ b/indra/newview/llsettingspicker.cpp @@ -152,7 +152,11 @@ void LLFloaterSettingsPicker::onClose(bool app_quitting) owner->setFocus(true); } mSettingItemID.setNull(); - mInventoryPanel->getRootFolder()->clearSelection(); + mInventoryPanel->clearSelection(); + if (mInventoryPanel->getRootFolder()) + { + mInventoryPanel->getRootFolder()->clearSelection(); + } } void LLFloaterSettingsPicker::setValue(const LLSD& value) |