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

Restore dropped header include and make constness match sim code.

meow-7.2.2
Graham Linden 2018-06-05 17:29:58 +01:00
parent 11a7c22b72
commit 499993e3aa
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llinventory/llsettingsbase.h
View File

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

2
indra/newview/llenvironment.h
View File

@ -36,6 +36,8 @@
#include "llsettingswater.h"
#include "llsettingsdaycycle.h"
#include "llatmosphere.h"
#include <boost/signals2.hpp>
//-------------------------------------------------------------------------