summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Serdjuk <dserduk@productengine.com>2009-11-06 15:41:05 +0200
committerDenis Serdjuk <dserduk@productengine.com>2009-11-06 15:41:05 +0200
commite4fdc0ba558ec8960796c9663c4a7e2ec92d8916 (patch)
tree4d66b86b5453dbd2fdb222c01c3323faac8c2857
parentbc3377c1f6ed295afd7636d907702976adfd846d (diff)
no ticket. major crash in Panel Landmark has been fixed. It was founded while investigating EXT-1607.
--HG-- branch : product-engine
-rw-r--r--indra/newview/llpanellandmarks.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index c516546282..62dc881738 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -829,17 +829,18 @@ bool LLLandmarksPanel::canSelectedBeModified(const std::string& command_name) co
// then ask LLFolderView permissions
if (can_be_modified)
{
+ LLFolderViewItem* selected = getCurSelectedItem();
if ("cut" == command_name)
{
can_be_modified = mCurrentSelectedList->getRootFolder()->canCut();
}
else if ("rename" == command_name)
{
- can_be_modified = getCurSelectedItem()->getListener()->isItemRenameable();
+ can_be_modified = selected? selected->getListener()->isItemRenameable() : false;
}
else if ("delete" == command_name)
{
- can_be_modified = getCurSelectedItem()->getListener()->isItemRemovable();
+ can_be_modified = selected? selected->getListener()->isItemRemovable(): false;
}
else if("paste" == command_name)
{