1 files changed, 37 insertions, 37 deletions

diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index c42cd6c6ba..3dcffa91ac 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -141,7 +141,7 @@ LLPanelPrimMediaControls::~LLPanelPrimMediaControls()
 {
 }
 
-BOOL LLPanelPrimMediaControls::postBuild()
+bool LLPanelPrimMediaControls::postBuild()
 {
 	mMediaRegion			= getChild<LLView>("media_region");
 	mBackCtrl				= getChild<LLUICtrl>("back");
@@ -223,8 +223,8 @@ BOOL LLPanelPrimMediaControls::postBuild()
 
 	mCurrentZoom = ZOOM_NONE;
 	// clicks on buttons do not remove keyboard focus from media
-	setIsChrome(TRUE);
-	return TRUE;
+	setIsChrome(true);
+	return true;
 }
 
 void LLPanelPrimMediaControls::setMediaFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal)
@@ -297,7 +297,7 @@ void LLPanelPrimMediaControls::updateShape()
 	
 	if(!media_impl || gFloaterTools->getVisible())
 	{
-		setVisible(FALSE);
+		setVisible(false);
 		return;
 	}
 
@@ -443,17 +443,17 @@ void LLPanelPrimMediaControls::updateShape()
 			switch(result)
 			{
 				case LLPluginClassMediaOwner::MEDIA_PLAYING:
-					mPlayCtrl->setEnabled(FALSE);
-					mPlayCtrl->setVisible(FALSE);
-					mPauseCtrl->setEnabled(TRUE);
+					mPlayCtrl->setEnabled(false);
+					mPlayCtrl->setVisible(false);
+					mPauseCtrl->setEnabled(true);
 					mPauseCtrl->setVisible(has_focus);
 					
 					break;
 				case LLPluginClassMediaOwner::MEDIA_PAUSED:
 				default:
-					mPauseCtrl->setEnabled(FALSE);
-					mPauseCtrl->setVisible(FALSE);
-					mPlayCtrl->setEnabled(TRUE);
+					mPauseCtrl->setEnabled(false);
+					mPauseCtrl->setVisible(false);
+					mPlayCtrl->setEnabled(true);
 					mPlayCtrl->setVisible(has_focus);
 					break;
 			}
@@ -469,17 +469,17 @@ void LLPanelPrimMediaControls::updateShape()
 				mCurrentURL.clear();
 			}
 			
-			mPlayCtrl->setVisible(FALSE);
-			mPauseCtrl->setVisible(FALSE);
-			mMediaStopCtrl->setVisible(FALSE);
+			mPlayCtrl->setVisible(false);
+			mPauseCtrl->setVisible(false);
+			mMediaStopCtrl->setVisible(false);
 			mMediaAddressCtrl->setVisible(has_focus && !mini_controls);
 			mMediaAddressCtrl->setEnabled(has_focus && !mini_controls);
-			mMediaPlaySliderPanel->setVisible(FALSE);
-			mMediaPlaySliderPanel->setEnabled(FALSE);
-			mSkipFwdCtrl->setVisible(FALSE);
-			mSkipFwdCtrl->setEnabled(FALSE);
-			mSkipBackCtrl->setVisible(FALSE);
-			mSkipBackCtrl->setEnabled(FALSE);
+			mMediaPlaySliderPanel->setVisible(false);
+			mMediaPlaySliderPanel->setEnabled(false);
+			mSkipFwdCtrl->setVisible(false);
+			mSkipFwdCtrl->setEnabled(false);
+			mSkipBackCtrl->setVisible(false);
+			mSkipBackCtrl->setEnabled(false);
 			
 			if(media_impl->getVolume() <= 0.0)
 			{
@@ -515,17 +515,17 @@ void LLPanelPrimMediaControls::updateShape()
 			
 			if(result == LLPluginClassMediaOwner::MEDIA_LOADING)
 			{
-				mReloadCtrl->setEnabled(FALSE);
-				mReloadCtrl->setVisible(FALSE);
-				mStopCtrl->setEnabled(TRUE);
+				mReloadCtrl->setEnabled(false);
+				mReloadCtrl->setVisible(false);
+				mStopCtrl->setEnabled(true);
 				mStopCtrl->setVisible(has_focus);
 			}
 			else
 			{
-				mReloadCtrl->setEnabled(TRUE);
+				mReloadCtrl->setEnabled(true);
 				mReloadCtrl->setVisible(has_focus);
-				mStopCtrl->setEnabled(FALSE);
-				mStopCtrl->setVisible(FALSE);
+				mStopCtrl->setEnabled(false);
+				mStopCtrl->setVisible(false);
 			}
 		}
 		
@@ -741,7 +741,7 @@ void LLPanelPrimMediaControls::updateShape()
 		else
 		{
 			// I don't think this is correct anymore.  This is done in draw() after the fade has completed.
-			//			setVisible(FALSE);
+			//			setVisible(false);
 		}
 	}
 }
@@ -834,10 +834,10 @@ void LLPanelPrimMediaControls::draw()
 	}
 }
 
-BOOL LLPanelPrimMediaControls::handleScrollWheel(S32 x, S32 y, S32 clicks)
+bool LLPanelPrimMediaControls::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
     mInactivityTimer.start();
-    BOOL res = FALSE;
+    bool res = false;
 
     // Unlike other mouse events, we need to handle scroll here otherwise
     // it will be intercepted by camera and won't reach toolpie
@@ -850,10 +850,10 @@ BOOL LLPanelPrimMediaControls::handleScrollWheel(S32 x, S32 y, S32 clicks)
     return res;
 }
 
-BOOL LLPanelPrimMediaControls::handleScrollHWheel(S32 x, S32 y, S32 clicks)
+bool LLPanelPrimMediaControls::handleScrollHWheel(S32 x, S32 y, S32 clicks)
 {
     mInactivityTimer.start();
-    BOOL res = FALSE;
+    bool res = false;
 
     if (LLViewerMediaFocus::getInstance()->isHoveringOverFocused())
     {
@@ -864,19 +864,19 @@ BOOL LLPanelPrimMediaControls::handleScrollHWheel(S32 x, S32 y, S32 clicks)
     return res;
 }
 
-BOOL LLPanelPrimMediaControls::handleMouseDown(S32 x, S32 y, MASK mask)
+bool LLPanelPrimMediaControls::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	mInactivityTimer.start();
 	return LLPanel::handleMouseDown(x, y, mask);
 }
 
-BOOL LLPanelPrimMediaControls::handleMouseUp(S32 x, S32 y, MASK mask)
+bool LLPanelPrimMediaControls::handleMouseUp(S32 x, S32 y, MASK mask)
 {
 	mInactivityTimer.start();
 	return LLPanel::handleMouseUp(x, y, mask);
 }
 
-BOOL LLPanelPrimMediaControls::handleKeyHere( KEY key, MASK mask )
+bool LLPanelPrimMediaControls::handleKeyHere( KEY key, MASK mask )
 {
 	mInactivityTimer.start();
 	return LLPanel::handleKeyHere(key, mask);
@@ -934,7 +934,7 @@ void LLPanelPrimMediaControls::close()
 {
 	resetZoomLevel(true);
 	LLViewerMediaFocus::getInstance()->clearFocus();
-	setVisible(FALSE);
+	setVisible(false);
 }
 
 
@@ -1120,7 +1120,7 @@ void LLPanelPrimMediaControls::updateZoom()
 	{
 	case ZOOM_NONE:
 		{
-			gAgentCamera.setFocusOnAvatar(TRUE, ANIMATE);
+			gAgentCamera.setFocusOnAvatar(true, ANIMATE);
 			break;
 		}
 	case ZOOM_FAR:
@@ -1140,7 +1140,7 @@ void LLPanelPrimMediaControls::updateZoom()
 		}
 	default:
 		{
-			gAgentCamera.setFocusOnAvatar(TRUE, ANIMATE);
+			gAgentCamera.setFocusOnAvatar(true, ANIMATE);
 			break;
 		}
 	}
@@ -1420,7 +1420,7 @@ void LLPanelPrimMediaControls::clearFaceOnFade()
 		// Hiding this object makes scroll events go missing after it fades out
 		// (see DEV-41755 for a full description of the train wreck).
 		// Only hide the controls when we're untargeting.
-		setVisible(FALSE);
+		setVisible(false);
 
 		mClearFaceOnFade = false;
 		mVolumeSliderVisible = 0;