diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-01-30 18:05:27 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-01-30 18:05:27 +0200 |
| commit | c8a79a59c94192741c8239eac6b34e50fe835bcd (patch) | |
| tree | 35becd78219228f4b260bedc01dffc350c26d09d /indra | |
| parent | 1e1e759a797f7084dcba3472fefba0a6fa1521b3 (diff) | |
SL-10360 Show "Region environment" text for tracks if there is no parcel environment used.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_environment.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 66202982a2..868af617cb 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -314,6 +314,9 @@ std::string LLPanelEnvironmentInfo::getNameForTrackIndex(S32 index) if (mCurrentEnvironment->mDayCycleName.empty()) { invname = mCurrentEnvironment->mNameList[index]; + + if (!isRegion() && invname.empty()) + invname = getString("str_region_env"); } else if (!mCurrentEnvironment->mDayCycle->isTrackEmpty(index)) { diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index 32b6e56acd..51926351c0 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -19,6 +19,7 @@ <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string> <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string> <string name="str_empty">(empty)</string> + <string name="str_region_env">(region environment)</string> <layout_stack width="530" height="367" |