diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-04-24 10:19:03 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-04-24 10:19:03 -0700 |
| commit | 5bd41620d986e073e49255d9075093541e2a9ffe (patch) | |
| tree | 950443ba5447703e5718990b45b98591c6dc1f74 /indra/newview/llavataractions.cpp | |
| parent | 1ca5dd40765211dc993393caa0003cfa7505c1f5 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
viewer-release 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 70cc48f12b..307e72fe18 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -868,6 +868,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 |