1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
index 9aff1661ff..294bd4021d 100644
--- a/indra/newview/llpanellandmedia.cpp
+++ b/indra/newview/llpanellandmedia.cpp
@@ -78,12 +78,12 @@ LLPanelLandMedia::~LLPanelLandMedia()
 {
 }
 
-BOOL LLPanelLandMedia::postBuild()
+bool LLPanelLandMedia::postBuild()
 {
 
     mMediaTextureCtrl = getChild<LLTextureCtrl>("media texture");
     mMediaTextureCtrl->setCommitCallback( onCommitAny, this );
-    mMediaTextureCtrl->setAllowNoTexture ( TRUE );
+    mMediaTextureCtrl->setAllowNoTexture ( true );
     mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
     mMediaTextureCtrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
 
@@ -112,7 +112,7 @@ BOOL LLPanelLandMedia::postBuild()
     mSetURLButton = getChild<LLButton>("set_media_url");
     childSetAction("set_media_url", onSetBtn, this);
 
-    return TRUE;
+    return true;
 }
 
 
@@ -130,10 +130,10 @@ void LLPanelLandMedia::refresh()
         // something selected, hooray!
 
         // Display options
-        BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
+        bool can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
 
         mMediaURLEdit->setText(parcel->getMediaURL());
-        mMediaURLEdit->setEnabled( FALSE );
+        mMediaURLEdit->setEnabled( false );
 
         getChild<LLUICtrl>("current_url")->setValue(parcel->getMediaCurrentURL());
 
@@ -149,14 +149,14 @@ void LLPanelLandMedia::refresh()
         mMediaTypeCombo->setEnabled( can_change_media );
         getChild<LLUICtrl>("mime_type")->setValue(mime_type);
 
-        mMediaAutoScaleCheck->set( parcel->getMediaAutoScale () );
+        mMediaAutoScaleCheck->set( static_cast<bool>(parcel->getMediaAutoScale()) );
         mMediaAutoScaleCheck->setEnabled ( can_change_media );
 
         // Special code to disable looping checkbox for HTML MIME type
         // (DEV-10042 -- Parcel Media: "Loop Media" should be disabled for static media types)
         bool allow_looping = LLMIMETypes::findAllowLooping( mime_type );
         if ( allow_looping )
-            mMediaLoopCheck->set( parcel->getMediaLoop () );
+            mMediaLoopCheck->set( static_cast<bool>(parcel->getMediaLoop()) );
         else
             mMediaLoopCheck->set( false );
         mMediaLoopCheck->setEnabled ( can_change_media && allow_looping );
@@ -275,8 +275,8 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
     std::string media_url   = self->mMediaURLEdit->getText();
     std::string media_desc  = self->mMediaDescEdit->getText();
     std::string mime_type   = self->getChild<LLUICtrl>("mime_type")->getValue().asString();
-    U8 media_auto_scale     = self->mMediaAutoScaleCheck->get();
-    U8 media_loop           = self->mMediaLoopCheck->get();
+    U8 media_auto_scale     = static_cast<U8>(self->mMediaAutoScaleCheck->get());
+    U8 media_loop           = static_cast<U8>(self->mMediaLoopCheck->get());
     S32 media_width         = (S32)self->mMediaWidthCtrl->get();
     S32 media_height        = (S32)self->mMediaHeightCtrl->get();
     LLUUID media_id         = self->mMediaTextureCtrl->getImageAssetID();