diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-30 22:34:56 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-30 22:34:56 +0300 |
| commit | 657e434fd59139436e8b97e5ecd01ca686e82269 (patch) | |
| tree | bebf0c4c8adff3587cec47f6403757f841f5c872 /indra/newview/llwlparammanager.h | |
| parent | 6f1cdd4926444567d21b1d6e0735a445b981e56b (diff) | |
STORM-1253 WIP New day cycle editor.
Done:
* Creating new local day cycles.
* Editing existing local day cycles.
* Deleting day cycles.
To do:
* Editing region day cycle, dealing with skies in region scope.
* Handle teleport while editing a day cycle.
* Update UI when a day cycle or sky preset gets deleted.
* Make the time ctrl increase/decrease consistently.
Diffstat (limited to 'indra/newview/llwlparammanager.h')
| -rw-r--r-- | indra/newview/llwlparammanager.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h index 7903661a7e..30fc8cd68f 100644 --- a/indra/newview/llwlparammanager.h +++ b/indra/newview/llwlparammanager.h @@ -139,7 +139,7 @@ public: } inline LLWLParamKey() // NOT really valid, just so std::maps can return a default of some sort - : name(NULL), scope(SCOPE_LOCAL) + : name(""), scope(SCOPE_LOCAL) { } @@ -168,6 +168,12 @@ public: return llsd; } + inline void fromLLSD(const LLSD& llsd) + { + name = llsd[NAME_IDX].asString(); + scope = EScope(llsd[SCOPE_IDX].asInteger()); + } + inline bool operator <(const LLWLParamKey other) const { if (name < other.name) |