diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-04-22 13:32:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-04-22 13:32:15 -0700 |
| commit | f6bb6a0f935323434a3f3d0d94e94c8d8238effe (patch) | |
| tree | 81945284f515f25ce23284077b1e07f500ad64ff /indra/newview/llavataractions.cpp | |
| parent | c79abac5ad5d41f86655883fd9f3ec6a108967a7 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Pull merge from lindenlab/viewer-release
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 |