diff options
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index a605f791a5..65c4748d02 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -103,37 +103,6 @@ public: typedef boost::signals2::connection connection_t; - class UserPrefs - { - friend class LLEnvironment; - public: - UserPrefs(); - - bool getUseRegionSettings() const { return mUseRegionSettings; } - bool getUseDayCycle() const { return mUseDayCycle; } - bool getUseFixedSky() const { return !getUseDayCycle(); } - - std::string getWaterPresetName() const { return mWaterPresetName; } - std::string getSkyPresetName() const { return mSkyPresetName; } - std::string getDayCycleName() const { return mDayCycleName; } - - void setUseRegionSettings(bool val); - void setUseWaterPreset(const std::string& name); - void setUseSkyPreset(const std::string& name); - void setUseDayCycle(const std::string& name); - - private: - void load(); - void store(); - - bool mUseRegionSettings; - bool mUseDayCycle; - bool mPersistEnvironment; - std::string mWaterPresetName; - std::string mSkyPresetName; - std::string mDayCycleName; - }; - typedef std::pair<LLSettingsSky::ptr_t, LLSettingsWater::ptr_t> fixedEnvironment_t; typedef std::function<void(S32, EnvironmentInfo::ptr_t)> environment_apply_fn; typedef boost::signals2::signal<void(EnvSelection_t)> env_changed_signal_t; @@ -143,10 +112,6 @@ public: virtual ~LLEnvironment(); - void loadPreferences(); - void updatePreferences(); - const UserPrefs & getPreferences() const { return mUserPrefs; } - bool canEdit() const; bool isExtendedEnvironmentEnabled() const; bool isInventoryEnabled() const; @@ -350,8 +315,6 @@ private: env_changed_signal_t mSignalEnvChanged; - UserPrefs mUserPrefs; - S32 mCurrentTrack; altitude_list_t mTrackAltitudes; |