diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-26 19:32:20 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-26 19:32:20 +0300 |
| commit | c0037909d576fc4922b92dfcc83d865d61ac43cb (patch) | |
| tree | 3c60062923b841324281e073e22481b5c217b0e8 /indra/newview/llwlparammanager.h | |
| parent | c32b19f31d4d5d0b32fcf64cce1cebd7d79b9b05 (diff) | |
STORM-1284 FIXED Changes to region environment are now visible immediately.
Pressing "Apply" sends the settings update to server.
Pressing "Cancel" reverts to current region settings.
Diffstat (limited to 'indra/newview/llwlparammanager.h')
| -rw-r--r-- | indra/newview/llwlparammanager.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h index eb810a4086..7903661a7e 100644 --- a/indra/newview/llwlparammanager.h +++ b/indra/newview/llwlparammanager.h @@ -245,8 +245,11 @@ public: /// apply default sky params void applyDefaults(); - /// apply default sky params - bool applyDayCycle(const std::string& day); + /// apply specified day cycle, setting time to noon by default + bool applyDayCycleParams(const LLSD& params, LLEnvKey::EScope scope, F32 time = 0.5); + + /// apply specified fixed sky params + bool applySkyParams(const LLSD& params); // get where the light is pointing inline LLVector4 getLightDir(void) const; @@ -288,6 +291,9 @@ public: /// add all skies in LLSD using the given scope void addAllSkies(LLEnvKey::EScope scope, const LLSD& preset_map); + /// refresh region-scope presets + void refreshRegionPresets(); + // 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.) std::map<LLWLParamKey, LLWLParamSet> finalizeFromDayCycle(LLWLParamKey::EScope scope); |