diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-04-30 16:37:08 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-04-30 16:37:08 -0700 |
| commit | 438609699b838924becee89fa9d8ec83552f3236 (patch) | |
| tree | ba2ebdd1e2ce3680bd2c4c1fb1ebb6fecc926de0 /indra/newview/llenvironment.h | |
| parent | cf0e4f79f52b4fb24769aa6e355ec8c95c6d2afc (diff) | |
New water settings dialog.
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index 95b24314cb..cb6cd11608 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -143,7 +143,7 @@ public: void updateGLVariablesForSettings(LLGLSLShader *shader, const LLSettingsBase::ptr_t &psetting); void updateShaderUniforms(LLGLSLShader *shader); - void setSelectedEnvironment(EnvSelection_t env, F64Seconds transition = TRANSITION_DEFAULT); + void setSelectedEnvironment(EnvSelection_t env, F64Seconds transition = TRANSITION_DEFAULT, bool forced = false); EnvSelection_t getSelectedEnvironment() const { return mSelectedEnvironment; } bool hasEnvironment(EnvSelection_t env); @@ -159,7 +159,7 @@ public: LLSettingsSky::ptr_t getEnvironmentFixedSky(EnvSelection_t env) { return getEnvironmentFixed(env).first; }; LLSettingsWater::ptr_t getEnvironmentFixedWater(EnvSelection_t env) { return getEnvironmentFixed(env).second; }; - void updateEnvironment(F64Seconds transition = TRANSITION_DEFAULT); + void updateEnvironment(F64Seconds transition = TRANSITION_DEFAULT, bool forced = false); void addSky(const LLSettingsSky::ptr_t &sky); void addWater(const LLSettingsWater::ptr_t &sky); @@ -187,6 +187,9 @@ public: inline LLVector4 getClampedLightDirection() const { return LLVector4(mCurrentEnvironment->getSky()->getClampedLightDirection(), 0.0f); } inline LLVector4 getRotatedLight() const { return mRotatedLight; } + static LLSettingsWater::ptr_t createWaterFromLegacyPreset(const std::string filename); + static LLSettingsSky::ptr_t createSkyFromLegacyPreset(const std::string filename); + //------------------------------------------- connection_t setSkyListChange(const change_signal_t::slot_type& cb); connection_t setWaterListChange(const change_signal_t::slot_type& cb); @@ -356,7 +359,7 @@ private: void onTransitionDone(const LLSettingsBlender::ptr_t, bool isSky); //========================================================================= void legacyLoadAllPresets(); - LLSD legacyLoadPreset(const std::string& path); + static LLSD legacyLoadPreset(const std::string& path); static std::string getSysDir(const std::string &subdir); static std::string getUserDir(const std::string &subdir); |