diff options
| -rw-r--r-- | indra/newview/llpanelgroup.cpp | 12 | 
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index 706787e824..c00b6a4147 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -59,6 +59,8 @@  #include "llaccordionctrltab.h"  #include "llaccordionctrl.h" +#include "lltrans.h" +  static LLRegisterPanelClassWrapper<LLPanelGroup> t_panel_group("panel_group_info_sidetray"); @@ -333,8 +335,9 @@ void LLPanelGroup::update(LLGroupChange gc)  	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);  	if(gdatap)  	{ -		childSetValue("group_name", gdatap->mName); -		childSetToolTip("group_name",gdatap->mName); +		std::string group_name =  gdatap->mName.empty() ? LLTrans::getString("LoadingData") : gdatap->mName; +		childSetValue("group_name", group_name); +		childSetToolTip("group_name",group_name);  		LLGroupData agent_gdatap;  		bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike(); @@ -379,8 +382,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)  	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);  	if(gdatap)  	{ -		childSetValue("group_name", gdatap->mName); -		childSetToolTip("group_name",gdatap->mName); +		std::string group_name =  gdatap->mName.empty() ? LLTrans::getString("LoadingData") : gdatap->mName; +		childSetValue("group_name", group_name); +		childSetToolTip("group_name",group_name);  	}  	LLButton* button_apply = findChild<LLButton>("btn_apply");  | 
