1 files changed, 30 insertions, 45 deletions

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index bbd1ef45f4..7bef0339c5 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -77,7 +77,7 @@ LLProgressView::LLProgressView()
     mFadeFromLoginTimer.stop();
 }
 
-BOOL LLProgressView::postBuild()
+bool LLProgressView::postBuild()
 {
     mProgressBar = getChild<LLProgressBar>("login_progress_bar");
 
@@ -96,12 +96,12 @@ BOOL LLProgressView::postBuild()
     getChild<LLTextBox>("message_text")->setClickedCallback(onClickMessage, this);
 
     // hidden initially, until we need it
-    setVisible(FALSE);
+    setVisible(false);
 
     LLNotifications::instance().getChannel("AlertModal")->connectChanged(boost::bind(&LLProgressView::onAlertModal, this, _1));
 
     sInstance = this;
-    return TRUE;
+    return true;
 }
 
 
@@ -115,24 +115,24 @@ LLProgressView::~LLProgressView()
     sInstance = NULL;
 }
 
-BOOL LLProgressView::handleHover(S32 x, S32 y, MASK mask)
+bool LLProgressView::handleHover(S32 x, S32 y, MASK mask)
 {
     if( childrenHandleHover( x, y, mask ) == NULL )
     {
         gViewerWindow->setCursor(UI_CURSOR_WAIT);
     }
-    return TRUE;
+    return true;
 }
 
 
-BOOL LLProgressView::handleKeyHere(KEY key, MASK mask)
+bool LLProgressView::handleKeyHere(KEY key, MASK mask)
 {
     // Suck up all keystokes except CTRL-Q.
     if( ('Q' == key) && (MASK_CONTROL == mask) )
     {
         LLAppViewer::instance()->userQuit();
     }
-    return TRUE;
+    return true;
 }
 
 void LLProgressView::revealIntroPanel()
@@ -141,20 +141,20 @@ void LLProgressView::revealIntroPanel()
     std::string intro_url = gSavedSettings.getString("PostFirstLoginIntroURL");
     if ( intro_url.length() > 0 &&
             gSavedSettings.getBOOL("BrowserJavascriptEnabled") &&
-            gSavedSettings.getBOOL("PostFirstLoginIntroViewed" ) == FALSE )
+            !gSavedSettings.getBOOL("PostFirstLoginIntroViewed"))
     {
         // hide the progress bar
         getChild<LLView>("stack1")->setVisible(false);
 
         // navigate to intro URL and reveal widget
         mMediaCtrl->navigateTo( intro_url );
-        mMediaCtrl->setVisible( TRUE );
+        mMediaCtrl->setVisible( true );
 
 
         // flag as having seen the new user post login intro
-        gSavedSettings.setBOOL("PostFirstLoginIntroViewed", TRUE );
+        gSavedSettings.setBOOL("PostFirstLoginIntroViewed", true );
 
-        mMediaCtrl->setFocus(TRUE);
+        mMediaCtrl->setFocus(true);
     }
 
     mFadeFromLoginTimer.start();
@@ -173,7 +173,7 @@ void LLProgressView::setStartupComplete()
     }
 }
 
-void LLProgressView::setVisible(BOOL visible)
+void LLProgressView::setVisible(bool visible)
 {
     if (!visible && mFadeFromLoginTimer.getStarted())
     {
@@ -182,14 +182,14 @@ void LLProgressView::setVisible(BOOL visible)
     // hiding progress view
     if (getVisible() && !visible)
     {
-        LLPanel::setVisible(FALSE);
+        LLPanel::setVisible(false);
     }
     // showing progress view
     else if (visible && (!getVisible() || mFadeToWorldTimer.getStarted()))
     {
-        setFocus(TRUE);
+        setFocus(true);
         mFadeToWorldTimer.stop();
-        LLPanel::setVisible(TRUE);
+        LLPanel::setVisible(true);
     }
 }
 
@@ -251,7 +251,7 @@ void LLProgressView::drawLogos(F32 alpha)
                              iter->mDrawRect.getHeight(),
                              iter->mTexturep.get(),
                              UI_VERTEX_COLOR % alpha,
-                             FALSE,
+                             false,
                              iter->mClipRect,
                              iter->mOffsetRect);
     }
@@ -298,7 +298,7 @@ void LLProgressView::draw()
             gFocusMgr.releaseFocusIfNeeded( this );
 
             // turn off panel that hosts intro so we see the world
-            setVisible(FALSE);
+            setVisible(false);
 
             // stop observing events since we no longer care
             mMediaCtrl->remObserver( this );
@@ -368,7 +368,7 @@ void LLProgressView::loadLogo(const std::string &path,
     raw->expandToPowerOfTwo();
 
     TextureData data;
-    data.mTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE);
+    data.mTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), false);
     data.mDrawRect = pos_rect;
     data.mClipRect = clip_rect;
     data.mOffsetRect = offset_rect;
@@ -388,7 +388,7 @@ void LLProgressView::initLogos()
 
     // We don't know final screen rect yet, so we can't precalculate position fully
     LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl");
-    S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad;
+    S32 texture_start_x = (S32)logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad;
     S32 texture_start_y = -7;
 
     // Normally we would just preload these textures from textures.xml,
@@ -399,21 +399,6 @@ void LLProgressView::initLogos()
 
     temp_str += gDirUtilp->getDirDelimiter();
 
-#ifdef LL_FMODSTUDIO
-    // original image size is 264x96, it is on longer side but
-    // with no internal paddings so it gets additional padding
-    icon_width = 77;
-    icon_height = 21;
-    S32 pad_fmod_y = 4;
-    texture_start_x++;
-    loadLogo(temp_str + "fmod_logo.png",
-        image_codec,
-        LLRect(texture_start_x, texture_start_y + pad_fmod_y + icon_height, texture_start_x + icon_width, texture_start_y + pad_fmod_y),
-        default_clip,
-        default_clip);
-
-    texture_start_x += icon_width + default_pad + 1;
-#endif //LL_FMODSTUDIO
 #ifdef LL_HAVOK
     // original image size is 342x113, central element is on a larger side
     // plus internal padding, so it gets slightly more height than desired 32
@@ -502,7 +487,7 @@ void LLProgressView::initStartTexture(S32 location_id, bool is_in_production)
         {
             // HACK: getLocalTexture allows only power of two dimentions
             raw->expandToPowerOfTwo();
-            gStartTexture = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE);
+            gStartTexture = LLViewerTextureManager::getLocalTexture(raw.get(), false);
         }
     }
 
@@ -519,8 +504,8 @@ void LLProgressView::initTextures(S32 location_id, bool is_in_production)
     initStartTexture(location_id, is_in_production);
     initLogos();
 
-    childSetVisible("panel_icons", mLogosList.empty() ? FALSE : TRUE);
-    childSetVisible("panel_top_spacer", mLogosList.empty() ? TRUE : FALSE);
+    childSetVisible("panel_icons", !mLogosList.empty());
+    childSetVisible("panel_top_spacer", mLogosList.empty());
 }
 
 void LLProgressView::releaseTextures()
@@ -528,14 +513,14 @@ void LLProgressView::releaseTextures()
     gStartTexture = NULL;
     mLogosList.clear();
 
-    childSetVisible("panel_top_spacer", TRUE);
-    childSetVisible("panel_icons", FALSE);
+    childSetVisible("panel_top_spacer", true);
+    childSetVisible("panel_icons", false);
 }
 
-void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label)
+void LLProgressView::setCancelButtonVisible(bool b, const std::string& label)
 {
-    mCancelBtn->setVisible( b );
-    mCancelBtn->setEnabled( b );
+    mCancelBtn->setVisible(b);
+    mCancelBtn->setEnabled(b);
     mCancelBtn->setLabelSelected(label);
     mCancelBtn->setLabelUnselected(label);
 }
@@ -554,8 +539,8 @@ void LLProgressView::onCancelButtonClicked(void*)
     else
     {
         gAgent.teleportCancel();
-        sInstance->mCancelBtn->setEnabled(FALSE);
-        sInstance->setVisible(FALSE);
+        sInstance->mCancelBtn->setEnabled(false);
+        sInstance->setVisible(false);
     }
 }
 
@@ -605,7 +590,7 @@ bool LLProgressView::handleUpdate(const LLSD& event_data)
 
     if(percent.isDefined())
     {
-        setPercent(percent.asReal());
+        setPercent((F32)percent.asReal());
     }
     return false;
 }