diff options
| author | simon <none@none> | 2014-04-21 12:36:35 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 12:36:35 -0700 |
| commit | 0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (patch) | |
| tree | dd3f484813df4f1a74a525f3f6dddcbc91beac7c /indra/newview/llavataractions.cpp | |
| parent | e606b7918dc6dbe2a4048f4bbd8590bfc3eca90e (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge downstream code updating version to 3.7.7
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 |