summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelenvironment.cpp
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2019-01-30 18:05:27 +0200
committermaxim_productengine <mnikolenko@productengine.com>2019-01-30 18:05:27 +0200
commitc8a79a59c94192741c8239eac6b34e50fe835bcd (patch)
tree35becd78219228f4b260bedc01dffc350c26d09d /indra/newview/llpanelenvironment.cpp
parent1e1e759a797f7084dcba3472fefba0a6fa1521b3 (diff)
SL-10360 Show "Region environment" text for tracks if there is no parcel environment used.
Diffstat (limited to 'indra/newview/llpanelenvironment.cpp')
-rw-r--r--indra/newview/llpanelenvironment.cpp3
1 files changed, 3 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))
{