diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
| commit | 14293b7b0a63fe5be904cbdc853f3b185e13f3fc (patch) | |
| tree | 6a755ca689fc408de11e46b891fedb52002b6b9f /indra/newview/llenvironment.h | |
| parent | 71e89d6a493e51789008f74f87439611f11c13ab (diff) | |
| parent | e093a98f86ad46374f5067adb616a2aead73eff5 (diff) | |
Merge remote branch 'develop' into marchcat/xcode-16
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index f1205a72b7..217c069705 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -36,8 +36,6 @@ #include "llsettingswater.h" #include "llsettingsdaycycle.h" -#include "llatmosphere.h" - #include "llglslshader.h" #include <boost/signals2.hpp> @@ -131,8 +129,6 @@ public: LLSettingsSky::ptr_t getCurrentSky() const; LLSettingsWater::ptr_t getCurrentWater() const; - static void getAtmosphericModelSettings(AtmosphericModelSettings& settingsOut, const LLSettingsSky::ptr_t &psky); - void update(const LLViewerCamera * cam); static void updateGLVariablesForSettings(LLShaderUniforms* uniforms, const LLSettingsBase::ptr_t &psetting); |