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

Merge viewer-bear

meow-7.2.2
Ansariel 2015-11-13 21:15:19 +01:00
parent 54ae9d5593 2999933e4e
commit 4fde94fa86
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llprimitive/lldaeloader.cpp
View File

@ -1652,9 +1652,9 @@ void LLDAELoader::processChildJoints( domNode* pParentNode )
//-----------------------------------------------------------------------------
bool LLDAELoader::isNodeAJoint( domNode* pNode )
{
if ( !pNode )
if ( !pNode || !pNode->getName() )
{
LL_INFOS()<<"Created node is NULL"<<LL_ENDL;
LL_INFOS()<<"Created node is NULL or invalid"<<LL_ENDL;
return false;
}

2
indra/newview/llconversationview.cpp
View File

@ -439,7 +439,7 @@ void LLConversationViewSession::setIconsVisible(bool visible)
// Show/hide icons for the 1-n-1 chat.
LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(getViewModelItem());
if (vmi)
if (vmi && mItemPanel)
{
switch (vmi->getType())
{