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.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 62a88cde73..2220cca336 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -96,6 +96,7 @@ public:
inline void replaceSettings(LLSD settings)
{
mSettings = settings;
+ mBlendedFactor = 0.0;
setDirtyFlag(true);
}
@@ -146,6 +147,11 @@ public:
setValue(name, value.getValue());
}
+ inline F64 getBlendFactor() const
+ {
+ return mBlendedFactor;
+ }
+
// Note this method is marked const but may modify the settings object.
// (note the internal const cast). This is so that it may be called without
// special consideration from getters.
@@ -237,11 +243,17 @@ protected:
LLSD cloneSettings() const;
+ inline void setBlendFactor(F64 blendfactor)
+ {
+ mBlendedFactor = blendfactor;
+ }
+
private:
bool mDirty;
LLSD combineSDMaps(const LLSD &first, const LLSD &other) const;
+ F64 mBlendedFactor;
};