diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-01-31 14:48:35 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-01-31 14:48:35 -0800 |
| commit | f1ee481b82275cfadbce156514920750ebdd3065 (patch) | |
| tree | 696d9f348436078845da751bda91195aa01d1de7 /indra/newview | |
| parent | 52e1c6dd0ede685903fabc6575d8aaae112cbc4b (diff) | |
SL-10443
Fix sun/moon disc geo generation reversing the UVs of the images for same.
Remove comment about voidwater when depth clamp is unavailable as it no longer applies.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9be2e905a2..09b681ce74 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1836,11 +1836,6 @@ LLViewerWindow::LLViewerWindow(const Params& p) LLFeatureManager::getInstance()->applyRecommendedSettings(); gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE); } - - if (!gGLManager.mHasDepthClamp) - { - LL_INFOS("RenderInit") << "Missing feature GL_ARB_depth_clamp. Void water might disappear in rare cases." << LL_ENDL; - } // If we crashed while initializng GL stuff last time, disable certain features if (gSavedSettings.getBOOL("RenderInitError")) diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 7b5a922bbd..678f1fe748 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -1213,9 +1213,9 @@ bool LLVOSky::updateHeavenlyBodyGeometry(LLDrawable *drawable, F32 scale, const LLFace *facep; LLQuaternion rot = hb.getRotation(); - LLVector3 to_dir = LLVector3::x_axis * rot; - LLVector3 hb_right = LLVector3::y_axis * rot; - LLVector3 hb_up = LLVector3::z_axis * rot; + LLVector3 to_dir = LLVector3::x_axis * rot; + LLVector3 hb_right = LLVector3::y_axis_neg * rot; + LLVector3 hb_up = LLVector3::z_axis * rot; LLVector3 draw_pos = to_dir * HEAVENLY_BODY_DIST; |