diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
| commit | 0f608cb764856ae8586a9d9631842a782cb70a23 (patch) | |
| tree | 97a12c3bfcc14ae73df00c68141e9519493a0619 /indra/newview/lltoolgun.cpp | |
| parent | 97da85de0b1e0f8c2fc60c156c31b237b869230a (diff) | |
| parent | 4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltoolgun.cpp')
| -rw-r--r-- | indra/newview/lltoolgun.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp index fb96804bfa..ee757f2566 100644 --- a/indra/newview/lltoolgun.cpp +++ b/indra/newview/lltoolgun.cpp @@ -108,7 +108,14 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) if (gSavedSettings.getBOOL("MouseSun")) { LLVector3 sunpos = LLViewerCamera::getInstance()->getAtAxis(); - gSky.setSunAndMoonDirectionsCFR(sunpos, -sunpos); + gSky.setSunDirectionCFR(sunpos); + gSavedSettings.setVector3("SkySunDefaultPosition", LLViewerCamera::getInstance()->getAtAxis()); + } + + if (gSavedSettings.getBOOL("MouseMoon")) + { + LLVector3 moonpos = LLViewerCamera::getInstance()->getAtAxis(); + gSky.setMoonDirectionCFR(moonpos); gSavedSettings.setVector3("SkySunDefaultPosition", LLViewerCamera::getInstance()->getAtAxis()); } |