diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:31:19 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-24 10:31:19 +0000 |
commit | 6f77f8891a7b0e95e1ea946b48dcac93dc68fa1a (patch) | |
tree | b22e29c4ebc608de4813d4a6518447b2d7b64f10 /indra/newview/llpanellandmarks.cpp | |
parent | ebea9eed4d30376e8914c0e778250ecc45f9dd22 (diff) | |
parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) |
viewer2 merge
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r-- | indra/newview/llpanellandmarks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 4842fcac38..e3b8581aca 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -946,7 +946,8 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const ) { // disable some commands for multi-selection. EXT-1757 - if (root_folder_view->getSelectedCount() > 1) + if (root_folder_view && + root_folder_view->getSelectedCount() > 1) { return false; } |