From 080e26eba4f6f16eba6ac52727155720614da4ff Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 11 Nov 2015 19:37:36 +0200
Subject: [PATCH 1/2] MAINT-5728 fix for dae uploading crash

---
 indra/llprimitive/lldaeloader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index d884c30d61..afc88fc861 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1605,9 +1605,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;
 	}
 	

From 74bf67418dc7440afd1305ef8e0d157d3b5cb0f2 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <andreylproductengine@lindenlab.com>
Date: Thu, 12 Nov 2015 01:45:21 +0200
Subject: [PATCH 2/2] MAINT-5847 FIXED Crash on attempt to IM related to global
 toggle of people icons

---
 indra/newview/llconversationview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 3a6e4c4dfe..e4cf8d3fbb 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -437,7 +437,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())
 		{