diff options
| author | prep linden <prep@lindenlab.com> | 2011-06-17 10:48:14 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-06-17 10:48:14 -0400 |
| commit | 37d9f5eb0beecff596fa3f8c6f7ec2b9a9104d34 (patch) | |
| tree | 7966f3aa4024d98947bac1ad8baeaeb5e099f115 /indra/newview/llpanelplaces.cpp | |
| parent | ec6be3fdb91ed5f4fb0e50977a7b0814a678af0a (diff) | |
| parent | 806b11c5720e1bd9e9764fcfd896436b8385e8b2 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 7 |
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; |