diff options
Diffstat (limited to 'indra/llinventory/llsettingsbase.h')
-rw-r--r-- | indra/llinventory/llsettingsbase.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h index 50276b801a..a5499c4eb6 100644 --- a/indra/llinventory/llsettingsbase.h +++ b/indra/llinventory/llsettingsbase.h @@ -48,7 +48,7 @@ #define PTR_NAMESPACE std #define SETTINGS_OVERRIDE override -class LLSettingsBase : +class LLSettingsBase : public PTR_NAMESPACE::enable_shared_from_this<LLSettingsBase>, private boost::noncopyable { @@ -104,7 +104,7 @@ public: virtual LLSettingsType::type_e getSettingsTypeValue() const = 0; //--------------------------------------------------------------------- - // Settings status + // Settings status inline bool hasSetting(const std::string ¶m) const { return mSettings.has(param); } virtual bool isDirty() const { return mDirty; } virtual bool isVeryDirty() const { return mReplaced; } @@ -188,7 +188,7 @@ public: virtual LLSD getSettings() const; //--------------------------------------------------------------------- - // + // inline void setLLSD(const std::string &name, const LLSD &value) { mSettings[name] = value; @@ -269,7 +269,7 @@ public: { public: static const U32 VALIDATION_PARTIAL; - + typedef boost::function<bool(LLSD &, U32)> verify_pr; Validator(std::string name, bool required, LLSD::Type type, verify_pr verify = verify_pr(), LLSD defval = LLSD()) : @@ -329,7 +329,7 @@ protected: static LLSD settingValidation(LLSD settings); typedef std::set<std::string> stringset_t; - + // combining settings objects. Customize for specific setting types virtual void lerpSettings(const LLSettingsBase &other, BlendFactor mix); @@ -342,18 +342,18 @@ protected: LLSD interpolateSDMap(const LLSD &settings, const LLSD &other, const parammapping_t& defaults, BlendFactor mix) const; LLSD interpolateSDValue(const std::string& name, const LLSD &value, const LLSD &other, const parammapping_t& defaults, BlendFactor mix, const stringset_t& slerps) const; - /// when lerping between settings, some may require special handling. + /// when lerping between settings, some may require special handling. /// Get a list of these key to be skipped by the default settings lerp. /// (handling should be performed in the override of lerpSettings. - virtual stringset_t getSkipInterpolateKeys() const; + virtual stringset_t getSkipInterpolateKeys() const; - // A list of settings that represent quaternions and should be slerped + // A list of settings that represent quaternions and should be slerped // rather than lerped. virtual stringset_t getSlerpKeys() const { return stringset_t(); } virtual validation_list_t getValidationList() const = 0; - // Apply any settings that need special handling. + // Apply any settings that need special handling. virtual void applySpecial(void *, bool force = false) { }; virtual parammapping_t getParameterMap() const { return parammapping_t(); } @@ -362,7 +362,7 @@ protected: LLSD cloneSettings() const; - inline void setBlendFactor(BlendFactor blendfactor) + inline void setBlendFactor(BlendFactor blendfactor) { mBlendedFactor = blendfactor; } @@ -485,7 +485,7 @@ public: mLastUpdate = mTimeStart; } - virtual ~LLSettingsBlenderTimeDelta() + virtual ~LLSettingsBlenderTimeDelta() { } |