diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index b9f224aeb..7e28192d6 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -464,6 +464,11 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
 		return;
 	}
 
+	if (avatarp->isSelf() && LFSimFeatureHandler::instance().getOnLookMask() & 1)
+	{
+		return;
+	}
+
 	BOOL impostor = avatarp->isImpostor();
 	if (impostor)
 	{
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 7462b5d21..ea830b939 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -331,7 +331,6 @@ void onlook_mask_changed(const U8& mask)
 	// Now hide the UI, if needed
 	bool visible(~mask & 2);
 	gMenuBarView->setVisible(visible);
-	gStatusBar->setVisible(visible);
 	gStatusBar->setEnabled(visible);
 	// Cameras get no floaters in the way, but don't interrupt mouselook, otherwise.
 	bool ml(gAgentCamera.cameraMouselook());