diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-09-21 15:58:13 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-09-21 15:58:13 -0700 |
| commit | 150fba7c5cd24ad9ab343e762bfd15032e6a9462 (patch) | |
| tree | 54a8d169470368e460e4bfb7ecf3805b6d120033 /indra/newview/llsettingsbase.h | |
| parent | d4d0520f38f59c4f60da098da9c2217ca6e45d65 (diff) | |
Still not working. Black Sky.
Diffstat (limited to 'indra/newview/llsettingsbase.h')
| -rw-r--r-- | indra/newview/llsettingsbase.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llsettingsbase.h b/indra/newview/llsettingsbase.h index 01a19c8734..cd5098cbb6 100644 --- a/indra/newview/llsettingsbase.h +++ b/indra/newview/llsettingsbase.h @@ -45,6 +45,8 @@ class LLSettingsBase: private boost::noncopyable friend class LLEnvironment; public: + typedef std::map<std::string, S32> parammapping_t; + typedef boost::shared_ptr<LLSettingsBase> ptr_t; virtual ~LLSettingsBase() { }; @@ -122,6 +124,7 @@ protected: typedef std::set<std::string> stringset_t; + // combining settings objects. Customize for specific setting types virtual void lerpSettings(const LLSettingsBase &other, F32 mix); @@ -141,6 +144,8 @@ protected: // Apply any settings that need special handling. virtual void applySpecial(void *) { }; + virtual parammapping_t getParameterMap() const { return parammapping_t(); } + LLSD mSettings; private: |