diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
| commit | 3fda9bea31327f166dd1067f7e5c9ce251b40289 (patch) | |
| tree | d7bbf85ac5d6b15ed7d5db8b8b67a1cccbaca4f9 /indra/newview/llwlparammanager.h | |
| parent | 4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff) | |
| parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) | |
pull from gate
Diffstat (limited to 'indra/newview/llwlparammanager.h')
| -rw-r--r-- | indra/newview/llwlparammanager.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h index a55f5bd8fa..61f86b747f 100644 --- a/indra/newview/llwlparammanager.h +++ b/indra/newview/llwlparammanager.h @@ -29,7 +29,6 @@ #include <list> #include <map> -#include "llenvmanager.h" #include "llwlparamset.h" #include "llwlanimator.h" #include "llwldaycycle.h" @@ -146,9 +145,14 @@ public: /// apply specified day cycle, setting time to noon by default bool applyDayCycleParams(const LLSD& params, LLEnvKey::EScope scope, F32 time = 0.5); + /// Apply Default.xml map + void setDefaultDay(); + /// apply specified fixed sky params bool applySkyParams(const LLSD& params); + void setDefaultSky(); + // get where the light is pointing inline LLVector4 getLightDir(void) const; @@ -208,7 +212,7 @@ public: void addAllSkies(LLEnvKey::EScope scope, const LLSD& preset_map); /// refresh region-scope presets - void refreshRegionPresets(); + void refreshRegionPresets(const LLSD& region_sky_presets); // returns all skies referenced by the current day cycle (in mDay), with their final names // side effect: applies changes to all internal structures! (trashes all unreferenced skies in scope, keys in day cycle rescoped to scope, etc.) |