From 0f061689914d1d73272d373c877d1656933ae501 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 17 Aug 2016 20:35:00 +0300 Subject: MAINT-6655 Group inspector doesn't support default icon. --- indra/newview/llinspectgroup.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llinspectgroup.cpp') diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp index 8e91af321e..0c5a91e48a 100644 --- a/indra/newview/llinspectgroup.cpp +++ b/indra/newview/llinspectgroup.cpp @@ -233,7 +233,8 @@ void LLInspectGroup::processGroupData() getChild("group_details")->setValue( LLSD(data->mCharter) ); - getChild("group_icon")->setValue( LLSD(data->mInsigniaID) ); + // LLGroupIconCtrl + getChild("group_icon")->setValue(LLSD(mGroupID)); std::string cost; bool is_member = LLGroupActions::isInGroup(mGroupID); -- cgit v1.2.3 From c9cfa897d9a781b6781915d250bb8886c206cd3f Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 20 Sep 2016 17:47:30 +0300 Subject: MAINT-6655 fixed group list and inspector not always switching to default icon --- indra/newview/llinspectgroup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llinspectgroup.cpp') diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp index 0c5a91e48a..a4fce36783 100644 --- a/indra/newview/llinspectgroup.cpp +++ b/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("group_details")->setValue( LLSD(data->mCharter) ); - // LLGroupIconCtrl - getChild("group_icon")->setValue(LLSD(mGroupID)); + getChild("group_icon")->setIconId(data->mInsigniaID); std::string cost; bool is_member = LLGroupActions::isInGroup(mGroupID); -- cgit v1.2.3