diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-10 23:44:13 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-10 23:44:13 +0300 |
| commit | 4fd946fa3e5217b8f64e0fcd91d268c7eaf1bbf5 (patch) | |
| tree | e5c810ecd44990bce20ff502bce4df08976b80f1 /indra/newview/llwlanimator.cpp | |
| parent | 23d8fb9750afc158d97fdf51633ed59b1b36f223 (diff) | |
STORM-1305 WIP User sky presets now go first in all lists.
Diffstat (limited to 'indra/newview/llwlanimator.cpp')
| -rw-r--r-- | indra/newview/llwlanimator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llwlanimator.cpp b/indra/newview/llwlanimator.cpp index 0a3fd3cfee..e568638cf6 100644 --- a/indra/newview/llwlanimator.cpp +++ b/indra/newview/llwlanimator.cpp @@ -123,6 +123,7 @@ void LLWLAnimator::update(LLWLParamSet& curParams) } // determine moving target for final interpolation value + // *TODO: this will not work with lazy loading of sky presets. LLWLParamSet buf = LLWLParamSet(); buf.setAll(LLWLParamManager::getInstance()->mParamList[mFirstIt->second].getAll()); // just give it some values, otherwise it has no params to begin with (see comment in constructor) buf.mix(LLWLParamManager::getInstance()->mParamList[mFirstIt->second], LLWLParamManager::getInstance()->mParamList[mSecondIt->second], weight); // mix to determine moving target for interpolation finish (as below) @@ -137,6 +138,7 @@ void LLWLAnimator::update(LLWLParamSet& curParams) else { // do the interpolation and set the parameters + // *TODO: this will not work with lazy loading of sky presets. curParams.mix(LLWLParamManager::getInstance()->mParamList[mFirstIt->second], LLWLParamManager::getInstance()->mParamList[mSecondIt->second], weight); } } |
