diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-07-26 15:51:44 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-07-26 15:51:44 -0400 |
| commit | 60d15f78e17a2203d73d58c3f1c2af941d599277 (patch) | |
| tree | 58da32e9df5e9727e437efa90e98a0d4d2a3b0e9 /indra/newview/llpanelplaces.cpp | |
| parent | 85b316e5df41444eafe77964f1a4758ccfd40784 (diff) | |
| parent | f79a058f3ce50361b732061ab30f4a1923fba445 (diff) | |
merge with latest mesh-dev
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; |