diff options
| author | Squire <squire@lindenlab.com> | 2011-06-17 13:12:29 -0700 |
|---|---|---|
| committer | Squire <squire@lindenlab.com> | 2011-06-17 13:12:29 -0700 |
| commit | a1652204f1a9348755c9fe495c6e0afabd5dd80b (patch) | |
| tree | 02190dcbbd6d6217f8754aad0cf226597baab92d /indra/newview/llpanelplaces.cpp | |
| parent | f86a488231dc9a629d44a9f6aa6bfc9aa0eb57b4 (diff) | |
| parent | f0694e45c8d140bd93abe097ec8e8cc99630ed39 (diff) | |
Merge in viewer-development
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; |