diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-07-08 10:24:58 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-07-08 10:24:58 -0700 |
| commit | 884f89cb7058c97c4e23997c66f3dbfbb2501009 (patch) | |
| tree | 94ec4089abbd10f5b3b19bfe613c12d0139deb00 /indra | |
| parent | 7bed42161173552b212823542f047c181f2daf67 (diff) | |
EXP-983 FIX -- Viewer crashes around Place Profile and Landmarks listing in Viewer Experience
Drag and drop for LLFolderView now handles the empty mFolders case.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index e8a2d5539b..e90b6c1c3d 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1910,7 +1910,14 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, // by the folder which is the hierarchy root. if (!handled && !hasVisibleChildren()) { - handled = mFolders.front()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); + if (mFolders.empty()) + { + handled = handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); + } + else + { + handled = mFolders.front()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); + } } if (handled) |