Skip to content
Snippets Groups Projects
Commit 5506dca9 authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

STORM-1339 FIXED Making a preventive fix for a crash in LLPanelPlaces::onTeleportButtonClicked().

parent 735c0dbc
No related branches found
No related tags found
No related merge requests found
......@@ -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();
}
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment