diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-05 17:29:58 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-05 17:29:58 +0100 |
| commit | 499993e3aa89f49412861a6b7daff8e0e6f1c196 (patch) | |
| tree | 02b5f4c4534a92e0f9a6cb6078cae4865b5b513a | |
| parent | 11a7c22b72ba8bb1022aa65c51bf4a50310ce070 (diff) | |
Restore dropped header include and make constness match sim code.
| -rw-r--r-- | indra/llinventory/llsettingsbase.h | 2 | ||||
| -rw-r--r-- | indra/newview/llenvironment.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h index 374a2ec246..0920af4726 100644 --- a/indra/llinventory/llsettingsbase.h +++ b/indra/llinventory/llsettingsbase.h @@ -362,7 +362,7 @@ class LLSettingsBlenderTimeDelta : public LLSettingsBlender { public: LLSettingsBlenderTimeDelta(const LLSettingsBase::ptr_t &target, - const LLSettingsBase::ptr_t &initsetting, const LLSettingsBase::ptr_t &endsetting, LLSettingsBase::Seconds blend_span) : + const LLSettingsBase::ptr_t &initsetting, const LLSettingsBase::ptr_t &endsetting, const LLSettingsBase::Seconds& blend_span) : LLSettingsBlender(target, initsetting, endsetting), mBlendSpan(blend_span), mLastUpdate(0.0f), diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index d79a1b408a..66950b0625 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -36,6 +36,8 @@ #include "llsettingswater.h" #include "llsettingsdaycycle.h" +#include "llatmosphere.h" + #include <boost/signals2.hpp> //------------------------------------------------------------------------- |