diff options
| author | Richard Linden <none@none> | 2013-11-06 09:42:46 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-06 09:42:46 -0800 |
| commit | d9d46d908c0573dbcd45ec2a1bea56966823343b (patch) | |
| tree | 12c095a60fdbb9d7317f544ab3c72f55e9114f93 /indra/newview/llpanelgroup.cpp | |
| parent | 2cb781705e56e31e11c4c37891b2ac86326aa411 (diff) | |
| parent | a10eb7b240675b009430f6718d410399d8045581 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
| -rwxr-xr-x | indra/newview/llpanelgroup.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index c9a066864c..30bbc5dba0 100755 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -329,8 +329,9 @@ void LLPanelGroup::update(LLGroupChange gc) if(gdatap) { std::string group_name = gdatap->mName.empty() ? LLTrans::getString("LoadingData") : gdatap->mName; - childSetValue("group_name", group_name); - childSetToolTip("group_name",group_name); + LLUICtrl* group_name_ctrl = getChild<LLUICtrl>("group_name"); + group_name_ctrl->setValue(group_name); + group_name_ctrl->setToolTip(group_name); LLGroupData agent_gdatap; bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike(); @@ -376,8 +377,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) if(gdatap) { std::string group_name = gdatap->mName.empty() ? LLTrans::getString("LoadingData") : gdatap->mName; - childSetValue("group_name", group_name); - childSetToolTip("group_name",group_name); + LLUICtrl* group_name_ctrl = getChild<LLUICtrl>("group_name"); + group_name_ctrl->setValue(group_name); + group_name_ctrl->setToolTip(group_name); } LLButton* button_apply = findChild<LLButton>("btn_apply"); |