summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterprofiletexture.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterprofiletexture.cpp')
-rw-r--r--indra/newview/llfloaterprofiletexture.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/llfloaterprofiletexture.cpp b/indra/newview/llfloaterprofiletexture.cpp
index ec2e627165..2217e81302 100644
--- a/indra/newview/llfloaterprofiletexture.cpp
+++ b/indra/newview/llfloaterprofiletexture.cpp
@@ -41,7 +41,7 @@
LLFloaterProfileTexture::LLFloaterProfileTexture(LLView* owner)
: LLFloater(LLSD())
- , mUpdateDimensions(TRUE)
+ , mUpdateDimensions(true)
, mLastHeight(0)
, mLastWidth(0)
, mImage(NULL)
@@ -63,18 +63,18 @@ LLFloaterProfileTexture::~LLFloaterProfileTexture()
}
// virtual
-BOOL LLFloaterProfileTexture::postBuild()
+bool LLFloaterProfileTexture::postBuild()
{
mProfileIcon = getChild<LLIconCtrl>("profile_pic");
mCloseButton = getChild<LLButton>("close_btn");
mCloseButton->setCommitCallback([this](LLUICtrl*, void*) { closeFloater(); }, nullptr);
- return TRUE;
+ return true;
}
// virtual
-void LLFloaterProfileTexture::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLFloaterProfileTexture::reshape(S32 width, S32 height, bool called_from_parent)
{
LLFloater::reshape(width, height, called_from_parent);
}
@@ -101,7 +101,7 @@ void LLFloaterProfileTexture::updateDimensions()
{
mAssetStatus = LLPreview::PREVIEW_ASSET_LOADED;
// Asset has been fully loaded
- mUpdateDimensions = TRUE;
+ mUpdateDimensions = true;
}
mLastHeight = img_height;
@@ -110,7 +110,7 @@ void LLFloaterProfileTexture::updateDimensions()
// Reshape the floater only when required
if (mUpdateDimensions)
{
- mUpdateDimensions = FALSE;
+ mUpdateDimensions = false;
LLRect old_floater_rect = getRect();
LLRect old_image_rect = mProfileIcon->getRect();
@@ -130,7 +130,7 @@ void LLFloaterProfileTexture::updateDimensions()
//reshape floater
reshape(width, height);
- gFloaterView->adjustToFitScreen(this, FALSE);
+ gFloaterView->adjustToFitScreen(this, false);
}
}
@@ -182,7 +182,7 @@ void LLFloaterProfileTexture::loadAsset(const LLUUID &image_id)
if ((mImage->getFullWidth() * mImage->getFullHeight()) == 0)
{
mImage->setLoadedCallback(LLFloaterProfileTexture::onTextureLoaded,
- 0, TRUE, FALSE, new LLHandle<LLFloater>(getHandle()), &mCallbackTextureList);
+ 0, true, false, new LLHandle<LLFloater>(getHandle()), &mCallbackTextureList);
mImage->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
mAssetStatus = LLPreview::PREVIEW_ASSET_LOADING;
@@ -192,18 +192,18 @@ void LLFloaterProfileTexture::loadAsset(const LLUUID &image_id)
mAssetStatus = LLPreview::PREVIEW_ASSET_LOADED;
}
- mUpdateDimensions = TRUE;
+ mUpdateDimensions = true;
updateDimensions();
}
// static
void LLFloaterProfileTexture::onTextureLoaded(
- BOOL success,
+ bool success,
LLViewerFetchedTexture *src_vi,
LLImageRaw* src,
LLImageRaw* aux_src,
S32 discard_level,
- BOOL final,
+ bool final,
void* userdata)
{
LLHandle<LLFloater>* handle = (LLHandle<LLFloater>*)userdata;
@@ -213,7 +213,7 @@ void LLFloaterProfileTexture::onTextureLoaded(
LLFloaterProfileTexture* floater = static_cast<LLFloaterProfileTexture*>(handle->get());
if (floater && success)
{
- floater->mUpdateDimensions = TRUE;
+ floater->mUpdateDimensions = true;
floater->updateDimensions();
}
}