diff options
| author | Oz Linden <oz@lindenlab.com> | 2020-06-15 15:29:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2020-06-15 15:29:04 -0400 |
| commit | 86009f885efc796850d3e5b612c896a9d737fb86 (patch) | |
| tree | 404923800dbc6d09ea72b10de0c7f4bb103d1e62 /indra/newview/lltoolgun.cpp | |
| parent | 17598f936bb6b099f21fc32aa80b68258cdfd0b9 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
SL-10297: merge up to master at 6.4.3
Diffstat (limited to 'indra/newview/lltoolgun.cpp')
| -rw-r--r-- | indra/newview/lltoolgun.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp index 6c9155be85..9539081f30 100644 --- a/indra/newview/lltoolgun.cpp +++ b/indra/newview/lltoolgun.cpp @@ -107,11 +107,18 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) if (gSavedSettings.getBOOL("MouseSun")) { - gSky.setSunDirection(LLViewerCamera::getInstance()->getAtAxis(), LLVector3(0.f, 0.f, 0.f)); - gSky.setOverrideSun(TRUE); + LLVector3 sunpos = LLViewerCamera::getInstance()->getAtAxis(); + gSky.setSunDirectionCFR(sunpos); gSavedSettings.setVector3("SkySunDefaultPosition", LLViewerCamera::getInstance()->getAtAxis()); } + if (gSavedSettings.getBOOL("MouseMoon")) + { + LLVector3 moonpos = LLViewerCamera::getInstance()->getAtAxis(); + gSky.setMoonDirectionCFR(moonpos); + gSavedSettings.setVector3("SkyMoonDefaultPosition", LLViewerCamera::getInstance()->getAtAxis()); + } + gViewerWindow->moveCursorToCenter(); gViewerWindow->hideCursor(); } |