From 45c48f7cd3fc6b94932004db8e29906d65a55344 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 20 Jul 2011 14:14:59 -0700
Subject: EXP-937 JavaScript can be turned off in the viewer which will break
 intro screen - investigate options

---
 indra/newview/llprogressview.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index fd9e768242..0f0afb96aa 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -136,6 +136,7 @@ void LLProgressView::revealIntroPanel()
 	// if user hasn't yet seen intro video
 	std::string intro_url = gSavedSettings.getString("PostFirstLoginIntroURL");
 	if ( intro_url.length() > 0 && 
+			gSavedSettings.getBOOL("BrowserJavascriptEnabled") &&
 			gSavedSettings.getBOOL("PostFirstLoginIntroViewed" ) == FALSE )
 	{
 		// hide the progress bar
@@ -148,6 +149,8 @@ void LLProgressView::revealIntroPanel()
 
 		// flag as having seen the new user post login intro
 		gSavedSettings.setBOOL("PostFirstLoginIntroViewed", TRUE );
+
+		mMediaCtrl->setFocus(TRUE);
 	}
 
 	mFadeFromLoginTimer.start();
-- 
cgit v1.2.3