diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-01-03 08:47:03 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-01-03 08:47:03 -0800 |
| commit | cccb3a541c655c15c7578bb50dd762b68ccbfcac (patch) | |
| tree | 724f8a16f9edbaaf461ca034a0ba413384d7c7e0 /indra/newview/llenvironment.h | |
| parent | 744e22e3645e205fa3f37ff3532bca607057887f (diff) | |
| parent | d607d81dba25dfe7dd1ecdf123af656ca939924f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index 47e0f0208b..1dd7496b02 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -380,7 +380,10 @@ private: mDayOffset(day_offset), mAltitudes(altitudes), mDayName() - {} + { + if (mDayp) + mDayName = mDayp->getName(); + } UpdateInfo(LLUUID settings_asset, std::string name, S32 day_length, S32 day_offset, altitudes_vect_t altitudes) : mDayp(), |