1 files changed, 102 insertions, 17 deletions

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 028891a90e..f86e583b9e 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -40,6 +40,7 @@
 
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcallbacklist.h"
 #include "llfocusmgr.h"
 #include "llnotifications.h"
 #include "llprogressbar.h"
@@ -50,6 +51,7 @@
 #include "llappviewer.h"
 #include "llweb.h"
 #include "lluictrlfactory.h"
+#include "llpanellogin.h"
 
 LLProgressView* LLProgressView::sInstance = NULL;
 
@@ -66,9 +68,13 @@ LLProgressView::LLProgressView()
 	mMediaCtrl( NULL ),
 	mMouseDownInActiveArea( false ),
 	mUpdateEvents("LLProgressView"),
-	mFadeToWorldTimer()
+	mFadeToWorldTimer(),
+	mFadeFromLoginTimer(),
+	mStartupComplete(false)
 {
 	mUpdateEvents.listen("self", boost::bind(&LLProgressView::handleUpdate, this, _1));
+	mFadeToWorldTimer.stop();
+	mFadeFromLoginTimer.stop();
 }
 
 BOOL LLProgressView::postBuild()
@@ -79,10 +85,11 @@ BOOL LLProgressView::postBuild()
 	mMediaCtrl = getChild<LLMediaCtrl>("login_media_panel");
 	mMediaCtrl->setVisible( false );		// hidden initially
 	mMediaCtrl->addObserver( this );		// watch events
+	
+	LLViewerMedia::setOnlyAudibleMediaTextureID(mMediaCtrl->getTextureID());
 
 	mCancelBtn = getChild<LLButton>("cancel_btn");
 	mCancelBtn->setClickedCallback(  LLProgressView::onCancelButtonClicked, NULL );
-	mFadeToWorldTimer.stop();
 
 	getChild<LLTextBox>("title_text")->setText(LLStringExplicit(LLAppViewer::instance()->getSecondLifeTitle()));
 
@@ -100,6 +107,9 @@ BOOL LLProgressView::postBuild()
 
 LLProgressView::~LLProgressView()
 {
+	// Just in case something went wrong, make sure we deregister our idle callback.
+	gIdleCallbacks.deleteFunction(onIdle, this);
+
 	gFocusMgr.releaseFocusIfNeeded( this );
 
 	sInstance = NULL;
@@ -130,18 +140,35 @@ 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
+		getChild<LLView>("stack1")->setVisible(false);
+		
 		// navigate to intro URL and reveal widget 
 		mMediaCtrl->navigateTo( intro_url );	
 		mMediaCtrl->setVisible( TRUE );
 
+
 		// flag as having seen the new user post login intro
 		gSavedSettings.setBOOL("PostFirstLoginIntroViewed", TRUE );
+
+		mMediaCtrl->setFocus(TRUE);
 	}
-	else
+
+	mFadeFromLoginTimer.start();
+	gIdleCallbacks.addFunction(onIdle, this);
+}
+
+void LLProgressView::setStartupComplete()
+{
+	mStartupComplete = true;
+
+	// if we are not showing a video, fade into world
+	if (!mMediaCtrl->getVisible())
 	{
-		// start the timer that will control the fade through to the world view 
+		mFadeFromLoginTimer.stop();
 		mFadeToWorldTimer.start();
 	}
 }
@@ -162,17 +189,15 @@ void LLProgressView::setVisible(BOOL visible)
 	} 
 }
 
-void LLProgressView::draw()
-{
-	static LLTimer timer;
 
-	// Paint bitmap if we've got one
-	glPushMatrix();	
+void LLProgressView::drawStartTexture(F32 alpha)
+{
+	gGL.pushMatrix();	
 	if (gStartTexture)
 	{
 		LLGLSUIDefault gls_ui;
 		gGL.getTexUnit(0)->bind(gStartTexture.get());
-		gGL.color4f(1.f, 1.f, 1.f, 1.f);
+		gGL.color4f(1.f, 1.f, 1.f, alpha);
 		F32 image_aspect = (F32)gStartImageWidth / (F32)gStartImageHeight;
 		S32 width = getRect().getWidth();
 		S32 height = getRect().getHeight();
@@ -180,13 +205,13 @@ void LLProgressView::draw()
 		// stretch image to maintain aspect ratio
 		if (image_aspect > view_aspect)
 		{
-			glTranslatef(-0.5f * (image_aspect / view_aspect - 1.f) * width, 0.f, 0.f);
-			glScalef(image_aspect / view_aspect, 1.f, 1.f);
+			gGL.translatef(-0.5f * (image_aspect / view_aspect - 1.f) * width, 0.f, 0.f);
+			gGL.scalef(image_aspect / view_aspect, 1.f, 1.f);
 		}
 		else
 		{
-			glTranslatef(0.f, -0.5f * (view_aspect / image_aspect - 1.f) * height, 0.f);
-			glScalef(1.f, view_aspect / image_aspect, 1.f);
+			gGL.translatef(0.f, -0.5f * (view_aspect / image_aspect - 1.f) * height, 0.f);
+			gGL.scalef(1.f, view_aspect / image_aspect, 1.f);
 		}
 		gl_rect_2d_simple_tex( getRect().getWidth(), getRect().getHeight() );
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
@@ -197,7 +222,27 @@ void LLProgressView::draw()
 		gGL.color4f(0.f, 0.f, 0.f, 1.f);
 		gl_rect_2d(getRect());
 	}
-	glPopMatrix();
+	gGL.popMatrix();
+}
+
+
+void LLProgressView::draw()
+{
+	static LLTimer timer;
+
+	if (mFadeFromLoginTimer.getStarted())
+	{
+		F32 alpha = clamp_rescale(mFadeFromLoginTimer.getElapsedTimeF32(), 0.f, FADE_TO_WORLD_TIME, 0.f, 1.f);
+		LLViewDrawContext context(alpha);
+
+		if (!mMediaCtrl->getVisible())
+		{
+			drawStartTexture(alpha);
+		}
+		
+		LLPanel::draw();
+		return;
+	}
 
 	// handle fade out to world view when we're asked to
 	if (mFadeToWorldTimer.getStarted())
@@ -205,6 +250,8 @@ void LLProgressView::draw()
 		// draw fading panel
 		F32 alpha = clamp_rescale(mFadeToWorldTimer.getElapsedTimeF32(), 0.f, FADE_TO_WORLD_TIME, 1.f, 0.f);
 		LLViewDrawContext context(alpha);
+				
+		drawStartTexture(alpha);
 		LLPanel::draw();
 
 		// faded out completely - remove panel and reveal world
@@ -212,6 +259,8 @@ void LLProgressView::draw()
 		{
 			mFadeToWorldTimer.stop();
 
+			LLViewerMedia::setOnlyAudibleMediaTextureID(LLUUID::null);
+
 			// Fade is complete, release focus
 			gFocusMgr.releaseFocusIfNeeded( this );
 
@@ -235,6 +284,7 @@ void LLProgressView::draw()
 		return;
 	}
 
+	drawStartTexture(1.0f);
 	// draw children
 	LLPanel::draw();
 }
@@ -349,9 +399,44 @@ bool LLProgressView::onAlertModal(const LLSD& notify)
 
 void LLProgressView::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 {
+	// the intro web content calls javascript::window.close() when it's done
 	if( event == MEDIA_EVENT_CLOSE_REQUEST )
 	{
-		// the intro web content calls javascript::window.close() when it's done
-		mFadeToWorldTimer.start();
+		if (mStartupComplete)
+		{
+			//make sure other timer has stopped
+			mFadeFromLoginTimer.stop();
+			mFadeToWorldTimer.start();
+		}
+		else
+		{
+			// hide the media ctrl and wait for startup to be completed before fading to world
+			mMediaCtrl->setVisible(false);
+			if (mMediaCtrl->getMediaPlugin())
+			{
+				mMediaCtrl->getMediaPlugin()->stop();
+			}
+
+			// show the progress bar
+			getChild<LLView>("stack1")->setVisible(true);
+		}
+	}
+}
+
+
+// static
+void LLProgressView::onIdle(void* user_data)
+{
+	LLProgressView* self = (LLProgressView*) user_data;
+
+	// Close login panel on mFadeToWorldTimer expiration.
+	if (self->mFadeFromLoginTimer.getStarted() &&
+		self->mFadeFromLoginTimer.getElapsedTimeF32() > FADE_TO_WORLD_TIME)
+	{
+		self->mFadeFromLoginTimer.stop();
+		LLPanelLogin::closePanel();
+
+		// Nothing to do anymore.
+		gIdleCallbacks.deleteFunction(onIdle, user_data);
 	}
 }