livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-10360 Show "Region environment" text for tracks if there is no parcel environment used.

master
maxim_productengine 2019-01-30 18:05:27 +02:00
parent 1e1e759a79
commit c8a79a59c9
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llpanelenvironment.cpp
View File

@ -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))
{

1
indra/newview/skins/default/xui/en/panel_region_environment.xml
View File

@ -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"