SL-12024 Remove 'Estate warning' message and show just region name instead

1 files changed, 5 insertions, 18 deletions

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 816ef68093..8bcc5bbe7a 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -200,8 +200,6 @@ public:
 
     virtual S32         getParcelId() override { return INVALID_PARCEL_ID; }
 
-    static void         updateEstateName(const std::string& name);
-
 protected:
     static const U32    DIRTY_FLAG_OVERRIDE;
 
@@ -609,13 +607,6 @@ LLPanelRegionExperiences* LLFloaterRegionInfo::getPanelExperiences()
 	return (LLPanelRegionExperiences*)tab->getChild<LLPanel>("Experiences");
 }
 
-void LLFloaterRegionInfo::updateEstateName(const std::string& estate_name)
-{
-	LLPanelEstateCovenant::updateEstateName(estate_name);
-	LLPanelEstateInfo::updateEstateName(estate_name);
-	LLPanelRegionEnvironment::updateEstateName(estate_name);
-}
-
 void LLFloaterRegionInfo::disableTabCtrls()
 {
 	LLTabContainer* tab = getChild<LLTabContainer>("region_panels");
@@ -3773,6 +3764,11 @@ bool LLPanelRegionEnvironment::refreshFromRegion(LLViewerRegion* region)
         setNoSelection(true);
         setControlsEnabled(false);
         mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION;
+        getChild<LLUICtrl>("region_text")->setValue(LLSD(""));
+    }
+    else
+    {
+        getChild<LLUICtrl>("region_text")->setValue(LLSD(region->getName()));
     }
     setNoSelection(false);
 
@@ -3832,15 +3828,6 @@ bool LLPanelRegionEnvironment::confirmUpdateEstateEnvironment(const LLSD& notifi
     return false;
 }
 
-void LLPanelRegionEnvironment::updateEstateName(const std::string& name)
-{
-	LLPanelRegionEnvironment* panelp = LLFloaterRegionInfo::getPanelEnvironment();
-	if (panelp)
-	{
-		panelp->getChildRef<LLTextBox>("estate_name").setText(name);
-	}
-}
-
 void LLPanelRegionEnvironment::onChkAllowOverride(bool value)
 {
     setDirtyFlag(DIRTY_FLAG_OVERRIDE);