diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-12 18:42:07 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-12 18:42:07 +0100 |
| commit | 67ab0084f87c40bf31d7fadded55cc9ea6299ca2 (patch) | |
| tree | 1d8119cd8d0b6078724a8128da37c15321a9f703 /indra/llinventory/llsettingsbase.cpp | |
| parent | 327ded51298599a0057c4a3baf388956ecfed2e5 (diff) | |
Fix env panel forward action.
Make env panel update environment when jumping frame to frame.
Add separate funcs for sun/moon vectors in various coord systems.
Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 1b3b5d2576..a261c98bb1 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -206,7 +206,9 @@ LLSD LLSettingsBase::interpolateSDMap(const LLSD &settings, const LLSD &other, F if (slerps.find(key_name) != slerps.end()) { - LLQuaternion q = slerp(mix, LLQuaternion(value), LLQuaternion(other_value)); + LLQuaternion a(value); + LLQuaternion b(other_value); + LLQuaternion q = slerp(mix, a, b); newvalue = q.getValue(); } else |