diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-04-23 12:47:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-04-23 12:47:23 -0700 |
| commit | 1953c569a6acfd731af2c459da7a6928be4aaf5b (patch) | |
| tree | f5e66a37eed56d418ad3fab290645a8ce4da943f /indra/newview/llavataractions.cpp | |
| parent | 8fd239233dca9639c6d0139e8f697da97bfe036e (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge with 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 |