summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingspicker.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-10-10 17:06:18 -0400
committerGitHub <noreply@github.com>2025-10-10 17:06:18 -0400
commit2a620a9447b7d0544d5c500d88b4128565486018 (patch)
treede0269e363215fbc3b92f8b63e33bc1d8b48a1b3 /indra/newview/llsettingspicker.cpp
parentdd9ea09d50ef5a4992d2ae29d2970ce05998bad0 (diff)
parentbab2137c12273777fcf7c176d1d4f385bf032887 (diff)
Merge pull request #4810 from secondlife/geenz/2025.07-lua-editor
Update Lua editor with latest 2025.07
Diffstat (limited to 'indra/newview/llsettingspicker.cpp')
-rw-r--r--indra/newview/llsettingspicker.cpp6
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)