From b7fb8fb0ca3d7081f0b68456fcbca6b445e29c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Sun, 20 Oct 2019 01:45:23 -0400
Subject: [PATCH] Restore intentional removal of mGroupName caching

This field rarely changes, once if ever, as far as I can see...
perhaps we shoulld reduce the amount of setValue calls it receives but
they're not hurting too much for now.
---
 indra/newview/llpanelgroupgeneral.cpp | 7 ++-----
 indra/newview/llpanelgroupgeneral.h   | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 0b9ace614..86b6054e4 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -83,7 +83,6 @@ LLPanelGroupGeneral::LLPanelGroupGeneral(const std::string& name,
 	mGroupNameEditor(NULL),
 	mFounderName(NULL),
 	mInsignia(NULL),
-	mGroupName(NULL),
 	mEditCharter(NULL),
 	mBtnJoinGroup(NULL),
 	mListVisibleMembers(NULL),
@@ -121,7 +120,6 @@ BOOL LLPanelGroupGeneral::postBuild()
 
 	// General info
 	mGroupNameEditor = getChild<LLLineEditor>("group_name_editor", recurse);
-	mGroupName = getChild<LLNameBox>("group_name", recurse);
 
 	mInsignia = getChild<LLTextureCtrl>("insignia", recurse);
 	if (mInsignia)
@@ -263,7 +261,7 @@ BOOL LLPanelGroupGeneral::postBuild()
 
 		mBtnJoinGroup->setVisible(FALSE);
 		mBtnInfo->setVisible(FALSE);
-		mGroupName->setVisible(FALSE);
+		getChildView("group_name")->setVisible(FALSE);
 	}
 
 	std::string member_count(LLTrans::getString("LoadingData"));
@@ -732,7 +730,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 		if (mInsignia) mInsignia->setEnabled(can_change_ident);
 		if (mEditCharter) mEditCharter->setEnabled(can_change_ident);
 
-		if (mGroupName) mGroupName->setValue(mGroupID);
+		getChildView("group_name")->setValue(mGroupID);
 		if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE);
 		if (mFounderName) mFounderName->setValue(gdatap->mFounderID);
 
@@ -907,7 +905,6 @@ void LLPanelGroupGeneral::updateChanged()
 	LLUICtrl *check_list[] =
 	{
 		mGroupNameEditor,
-		mGroupName,
 		mFounderName,
 		mInsignia,
 		mEditCharter,
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index 00b9c7fc9..aa54e83b7 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -91,7 +91,6 @@ private:
 
 	// Group information (include any updates in updateChanged)
 	LLLineEditor		*mGroupNameEditor;
-	LLNameBox 			*mGroupName;
 	LLNameBox			*mFounderName;
 	LLTextureCtrl		*mInsignia;
 	LLTextEditor		*mEditCharter;