livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
Vadim ProductEngine 2011-06-15 18:39:10 +03:00
parent 735c0dbc5f
commit 5506dca9b9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanellandmarks.cpp
View File

@ -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();
}

7
indra/newview/llpanelplaces.cpp
View File

@ -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;