diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 9be2e905a2aa6f66371ccbb53852cafe77b07263..09b681ce7413870ce878ae9a7389b7d134634950 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 7b5a922bbd536cbd5ac769346443a61ff68b2d8c..678f1fe7488cbd3cb1d0d422a64e9cbd517ba649 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;