summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-07-20 14:14:59 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-07-20 14:14:59 -0700
commit45c48f7cd3fc6b94932004db8e29906d65a55344 (patch)
treef61ea77d850e93a705094f11a74af45959f1f25f /indra
parent15f98992fa6634d2d980d193d349ca3c5cdb6a95 (diff)
EXP-937 JavaScript can be turned off in the viewer which will break intro screen - investigate options
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llprogressview.cpp3
1 files changed, 3 insertions, 0 deletions
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();