summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-04-22 11:19:58 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-04-22 11:19:58 -0400
commitd0eb9658f2698b9c200991e84c1a60be48788e2c (patch)
treedaadf5ce47cf869d3b9937cb834b0fb63539853a /indra/newview/llavataractions.cpp
parentea7f34d37ac1861fc1e48e11ca5030e424a05a85 (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rwxr-xr-xindra/newview/llavataractions.cpp4
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