diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-02 20:55:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-03 19:33:18 +0800 |
| commit | 3f72f9a202bed628f838cc24fe58a0511ca0d161 (patch) | |
| tree | 0684cfff91551d9b6aabdb825981b46a5cb53fe8 /indra/newview/llenvironment.h | |
| parent | d302bf3c96666cfd46d7585cb3d8b6ec27bb83bf (diff) | |
| parent | 9c0a6d1b0e5e9d6da6a63ff367f40ab08c064bbe (diff) | |
Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c
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 e56548d618..559a34bc47 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -38,8 +38,6 @@ #include "llsettingswater.h" #include "llsettingsdaycycle.h" -#include "llatmosphere.h" - #include "llglslshader.h" #include <boost/signals2.hpp> @@ -133,8 +131,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); |