diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-15 12:03:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-15 12:03:45 -0400 |
| commit | b779112256eb2dcf617d596a634a51150c5ed7f9 (patch) | |
| tree | 68a4d3fef9bfad9c6c1712c486c5c1d55ca7dfe7 | |
| parent | 624b050589b470951fc945c3b2cff11a4912150d (diff) | |
| parent | 5506dca9b9378168ea044d43b3a5c831b5fc35f7 (diff) | |
merge changes for storm-1339
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 7 |
2 files changed, 8 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(); } 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; |