diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-15 21:15:02 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-15 21:15:02 +0100 |
| commit | 66d78ce1c73d5da3bc5bc39fe0196a9f82040105 (patch) | |
| tree | 169d7034712a765a1befc2c4154a5f3bdcb5e13a /indra/llinventory/llsettingsbase.h | |
| parent | c07775798e0adb134a2b5df8295bdb0ed7d374bc (diff) | |
Make water and sky defaults take a position value to allow for default daycycle w/ multiple frames.
Make default daycycle add 8 frames at 0, 0.125, 0.25 etc
Merge over server-side bugfixes.
Eliminate extraneous dirty bits in sky settings.
Diffstat (limited to 'indra/llinventory/llsettingsbase.h')
| -rw-r--r-- | indra/llinventory/llsettingsbase.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h index f2fa78e41f..3a5296daa4 100644 --- a/indra/llinventory/llsettingsbase.h +++ b/indra/llinventory/llsettingsbase.h @@ -312,7 +312,7 @@ public: mInitial(initsetting), mFinal(endsetting) { - if (mInitial) + if (mInitial && mTarget) mTarget->replaceSettings(mInitial->getSettings()); if (!mFinal) @@ -333,7 +333,8 @@ public: if (!mFinal) mFinal = mInitial; - mTarget->replaceSettings(mInitial->getSettings()); + if (mTarget) + mTarget->replaceSettings(mInitial->getSettings()); } LLSettingsBase::ptr_t getTarget() const |