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

FIRE-10223: Blacklist crash fix when selecting a linked prim in an object

meow-7.2.2
Cinders 2013-05-06 22:12:18 -06:00
parent d40297fbe9
commit bf062e3b5d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewermenu.cpp
View File

@ -2746,7 +2746,7 @@ void derenderObject(bool permanent)
{
if (permanent)
{
std::string entry_name;
std::string entry_name = "";
std::string region_name;
if (objp->isAvatar())
@ -2758,11 +2758,13 @@ void derenderObject(bool permanent)
else
{
LLSelectNode* nodep = select_mgr->getSelection()->getFirstRootNode();
if (!nodep->mName.empty())
if (nodep)
{
entry_name = nodep->mName;
if (!nodep->mName.empty())
{
entry_name = nodep->mName;
}
}
LLViewerRegion* region = objp->getRegion();
if (region)
{