summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaces.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-06-21 11:47:58 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-06-21 11:47:58 -0400
commitfcf2ed5901699edfbc04d59d1a0517f19692df1a (patch)
tree3960aa76222776cb2b2dcd12fe1872850fc59ad7 /indra/newview/llpanelplaces.cpp
parent3595216efbeb0210f6c5777fd85a589bbbb08e4c (diff)
parent4d77146b9016a4db37112e153e71c05c596f7fdc (diff)
merged .hgtags & BuildParams
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
-rw-r--r--indra/newview/llpanelplaces.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 46262832dc..1e510a2d7b 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -584,6 +584,13 @@ void LLPanelPlaces::onTeleportButtonClicked()
{
if (mPlaceInfoType == LANDMARK_INFO_TYPE)
{
+ if (mItem.isNull())
+ {
+ llwarns << "NULL landmark item" << llendl;
+ llassert(mItem.notNull());
+ return;
+ }
+
LLSD payload;
payload["asset_id"] = mItem->getAssetUUID();
LLSD args;