SL-20098 handleDoubleClick crashes in new inventory panels

1 files changed, 13 insertions, 1 deletions

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 0801b71e34..eb603f0ac3 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2449,7 +2449,19 @@ BOOL LLInventoryGalleryItem::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
     if (mIsFolder && mGallery)
     {
-        mGallery->setRootFolder(mUUID);
+        // setRootFolder can destroy this item.
+        // Delay it until handleDoubleClick processing is complete
+        // or make gallery handle doubleclicks.
+        LLHandle<LLPanel> handle = mGallery->getHandle();
+        LLUUID navigate_to = mUUID;
+        doOnIdleOneTime([handle, navigate_to]()
+                        {
+                            LLInventoryGallery* gallery = (LLInventoryGallery*)handle.get();
+                            if (gallery)
+                            {
+                                gallery->setRootFolder(navigate_to);
+                            }
+                        });
     }
     else
     {