diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2014-04-22 12:19:28 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2014-04-22 12:19:28 -0600 |
| commit | ae564140c0ff1e05ebfab0752458313da0c07a79 (patch) | |
| tree | fc8a1c9828f2baf8a64b8439561d2db99fc12a81 /indra/newview/llavataractions.cpp | |
| parent | e36b90539525095101526086db5c0cd282060388 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index c5b1dc94b2..dad85a016c 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -876,6 +876,10 @@ bool LLAvatarActions::canShareSelectedItems(LLInventoryPanel* inv_panel /* = NUL // check selection in the panel LLFolderView* root_folder = inv_panel->getRootFolder(); + if (!root_folder) + { + return false; + } const std::set<LLFolderViewItem*> inventory_selected = root_folder->getSelectionList(); if (inventory_selected.empty()) return false; // nothing selected |