summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.cpp
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-06-17 10:48:14 -0400
committerprep linden <prep@lindenlab.com>2011-06-17 10:48:14 -0400
commit37d9f5eb0beecff596fa3f8c6f7ec2b9a9104d34 (patch)
tree7966f3aa4024d98947bac1ad8baeaeb5e099f115 /indra/newview/llpanellandmarks.cpp
parentec6be3fdb91ed5f4fb0e50977a7b0814a678af0a (diff)
parent806b11c5720e1bd9e9764fcfd896436b8385e8b2 (diff)
merge
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r--indra/newview/llpanellandmarks.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 80f6862169..c2729fa19b 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -299,7 +299,7 @@ void LLLandmarksPanel::onTeleport()
}
LLFolderViewEventListener* listenerp = current_item->getListener();
- if (listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK)
+ if (listenerp && listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK)
{
listenerp->openItem();
}