diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-10-07 12:41:00 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-10-07 12:41:00 +0300 |
| commit | 7ff09d05f2023ce8eb26acc46da22f8d86743de5 (patch) | |
| tree | f5810d1ab168a5dd8b97a25cc790e5eaf9c7f1f8 /indra/newview/llpanelenvironment.cpp | |
| parent | 7a7f68fb3c09c187f5b6fd333d0292a3fbfbc9df (diff) | |
SL-12024 Remove 'Estate warning' message and show just region name instead
Diffstat (limited to 'indra/newview/llpanelenvironment.cpp')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index c4fa4244b1..2ad7a23278 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -84,6 +84,7 @@ const std::string LLPanelEnvironmentInfo::PNL_ENVIRONMENT_ALTITUDES("pnl_environ const std::string LLPanelEnvironmentInfo::PNL_BUTTONS("pnl_environment_buttons"); const std::string LLPanelEnvironmentInfo::PNL_DISABLED("pnl_environment_disabled"); const std::string LLPanelEnvironmentInfo::TXT_DISABLED("txt_environment_disabled"); +const std::string LLPanelEnvironmentInfo::PNL_REGION_MSG("pnl_environment_region_msg"); const std::string LLPanelEnvironmentInfo::SDT_DROP_TARGET("sdt_drop_target"); const std::string LLPanelEnvironmentInfo::STR_LABEL_USEDEFAULT("str_label_use_default"); @@ -483,7 +484,7 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled) getChild<LLUICtrl>(PNL_BUTTONS)->setVisible(false); getChild<LLUICtrl>(PNL_DISABLED)->setVisible(true); getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setVisible(false); - + getChild<LLUICtrl>(PNL_REGION_MSG)->setVisible(false); updateEditFloater(mCurrentEnvironment, false); return false; @@ -491,6 +492,7 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled) getChild<LLUICtrl>(PNL_SETTINGS)->setVisible(true); getChild<LLUICtrl>(PNL_BUTTONS)->setVisible(true); getChild<LLUICtrl>(PNL_DISABLED)->setVisible(false); + getChild<LLUICtrl>(PNL_REGION_MSG)->setVisible(isRegion()); getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setVisible(LLEnvironment::instance().isExtendedEnvironmentEnabled()); getChild<LLUICtrl>(BTN_RST_ALTITUDES)->setVisible(isRegion()); |