MAINT-6655 fixed group list and inspector not always switching to default icon

indra/newview/llgrouplist.cpp

@@ -379,10 +379,7 @@ void LLGroupListItem::setGroupID(const LLUUID& group_id)
 
 void LLGroupListItem::setGroupIconID(const LLUUID& group_icon_id)
 {
-	if (group_icon_id.notNull())
-	{
-		mGroupIcon->setIconId(group_icon_id);
-	}
+	mGroupIcon->setIconId(group_icon_id);
 }
 
 void LLGroupListItem::setGroupIconVisible(bool visible)

indra/newview/llinspectgroup.cpp

@@ -41,6 +41,7 @@
 #include "lltooltip.h"	// positionViewNearMouse()
 #include "lltrans.h"
 #include "lluictrl.h"
+#include "llgroupiconctrl.h"
 
 //////////////////////////////////////////////////////////////////////////////
 // LLInspectGroup
@@ -233,8 +234,7 @@ void LLInspectGroup::processGroupData()
 
 		getChild<LLUICtrl>("group_details")->setValue( LLSD(data->mCharter) );
 
-		// LLGroupIconCtrl
-		getChild<LLUICtrl>("group_icon")->setValue(LLSD(mGroupID));
+		getChild<LLGroupIconCtrl>("group_icon")->setIconId(data->mInsigniaID);
 
 		std::string cost;
 		bool is_member = LLGroupActions::isInGroup(mGroupID);