summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingsbase.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llinventory/llsettingsbase.h')
-rw-r--r--indra/llinventory/llsettingsbase.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index fa5fb7a763..f5146b1c27 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -253,7 +253,6 @@ public:
mFinal(endsetting),
mSeconds(seconds),
mOnFinished(),
- mBlendThreshold(DEFAULT_THRESHOLD),
mLastUpdate(0.0f),
mTimeSpent(0.0f)
{
@@ -264,11 +263,11 @@ public:
~LLSettingsBlender() {}
- void reset( LLSettingsBase::ptr_t &initsetting, const LLSettingsBase::ptr_t &endsetting, F64 seconds )
+ void reset( LLSettingsBase::ptr_t &initsetting, const LLSettingsBase::ptr_t &endsetting, F64Seconds seconds )
{
mInitial = initsetting;
mFinal = endsetting;
- mSeconds.value(seconds);
+ mSeconds = seconds;
mTarget->replaceSettings(mInitial->getSettings());
mTimeStart.value(LLDate::now().secondsSinceEpoch());
mLastUpdate = mTimeStart;
@@ -280,16 +279,6 @@ public:
return mOnFinished.connect(onfinished);
}
- void setUpdateThreshold(F64Seconds threshold)
- {
- mBlendThreshold = threshold;
- }
-
- F64Seconds getUpdateThreshold() const
- {
- return mBlendThreshold;
- }
-
LLSettingsBase::ptr_t getTarget() const
{
return mTarget;
@@ -306,13 +295,13 @@ public:
}
void update(F64Seconds time);
+
private:
LLSettingsBase::ptr_t mTarget;
LLSettingsBase::ptr_t mInitial;
LLSettingsBase::ptr_t mFinal;
F64Seconds mSeconds;
finish_signal_t mOnFinished;
- F64Seconds mBlendThreshold;
F64Seconds mLastUpdate;
F64Seconds mTimeSpent;
F64Seconds mTimeStart;