diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-24 09:33:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 09:33:58 +0300 |
| commit | f32d3767dc6f0d4d831882135d2eb88ee96ba79d (patch) | |
| tree | 21685bf5688d93ee583d6f7059fdf5ccb7cea5f2 /indra/newview/llinventorypanel.cpp | |
| parent | 25e9c61eef179c7ad79d19261f72c1bc85a3ff1b (diff) | |
| parent | 57e78ed43b61864a6b8a54df95d8823daaeb5fe8 (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index e0f35aec70..59e9226837 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -643,7 +643,7 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve } // Select any newly created object that has the auto rename at top of folder root set. - if(mFolderRoot.get()->getRoot()->needsAutoRename()) + if(mFolderRoot.get() && mFolderRoot.get()->getRoot()->needsAutoRename()) { setSelection(item_id, false); } |