Skip to content
Snippets Groups Projects
Commit 682fd146 authored by Ychebotarev ProductEngine's avatar Ychebotarev ProductEngine
Browse files

fix for normal EXT-4554 [BSI] group join now button goes missing after failure...

fix for normal EXT-4554 [BSI] group join now button goes missing after failure to join due to maximum groups

--HG--
branch : product-engine
parent 14bbed35
No related branches found
No related tags found
No related merge requests found
...@@ -356,13 +356,6 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) ...@@ -356,13 +356,6 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it) for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
(*it)->setGroupID(group_id); (*it)->setGroupID(group_id);
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);
if(gdatap)
{
childSetValue("group_name", gdatap->mName);
childSetToolTip("group_name",gdatap->mName);
}
LLButton* button_apply = findChild<LLButton>("btn_apply"); LLButton* button_apply = findChild<LLButton>("btn_apply");
LLButton* button_refresh = findChild<LLButton>("btn_refresh"); LLButton* button_refresh = findChild<LLButton>("btn_refresh");
LLButton* button_create = findChild<LLButton>("btn_create"); LLButton* button_create = findChild<LLButton>("btn_create");
...@@ -464,6 +457,17 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) ...@@ -464,6 +457,17 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
} }
reposButtons(); reposButtons();
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mID);
if(gdatap)
{
childSetValue("group_name", gdatap->mName);
childSetToolTip("group_name",gdatap->mName);
//group data is already present, call update manually
update(GC_ALL);
}
} }
bool LLPanelGroup::apply(LLPanelGroupTab* tab) bool LLPanelGroup::apply(LLPanelGroupTab* tab)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment