Merge branch 'main' into release/luau-scripting.

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 040a477756..01a3902516 100644
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -50,7 +50,7 @@ LLPreviewAnim::LLPreviewAnim(const LLSD& key)
 }
 
 // virtual
-BOOL LLPreviewAnim::postBuild()
+bool LLPreviewAnim::postBuild()
 {
     childSetCommitCallback("desc", LLPreview::onText, this);
     getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
@@ -58,9 +58,9 @@ BOOL LLPreviewAnim::postBuild()
     pAdvancedStatsTextBox = getChild<LLTextBox>("AdvancedStats");
 
     // Assume that advanced stats start visible (for XUI preview tool's purposes)
-    pAdvancedStatsTextBox->setVisible(FALSE);
+    pAdvancedStatsTextBox->setVisible(false);
     LLRect rect = getRect();
-    reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, FALSE);
+    reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, false);
 
     return LLPreview::postBuild();
 }
@@ -180,10 +180,10 @@ void LLPreviewAnim::cleanup()
 {
     this->mItemID = LLUUID::null;
     this->mDidStart = false;
-    getChild<LLUICtrl>("Inworld")->setValue(FALSE);
-    getChild<LLUICtrl>("Locally")->setValue(FALSE);
-    getChild<LLUICtrl>("Inworld")->setEnabled(TRUE);
-    getChild<LLUICtrl>("Locally")->setEnabled(TRUE);
+    getChild<LLUICtrl>("Inworld")->setValue(false);
+    getChild<LLUICtrl>("Locally")->setValue(false);
+    getChild<LLUICtrl>("Inworld")->setEnabled(true);
+    getChild<LLUICtrl>("Locally")->setEnabled(true);
 }
 
 // virtual
@@ -200,19 +200,19 @@ void LLPreviewAnim::onClose(bool app_quitting)
 
 void LLPreviewAnim::showAdvanced()
 {
-    BOOL was_visible =  pAdvancedStatsTextBox->getVisible();
+    bool was_visible =  pAdvancedStatsTextBox->getVisible();
 
     if (was_visible)
     {
-        pAdvancedStatsTextBox->setVisible(FALSE);
+        pAdvancedStatsTextBox->setVisible(false);
         LLRect rect = getRect();
-        reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, FALSE);
+        reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, false);
     }
     else
     {
-        pAdvancedStatsTextBox->setVisible(TRUE);
+        pAdvancedStatsTextBox->setVisible(true);
         LLRect rect = getRect();
-        reshape(rect.getWidth(), rect.getHeight() + pAdvancedStatsTextBox->getRect().getHeight() + ADVANCED_VPAD, FALSE);
+        reshape(rect.getWidth(), rect.getHeight() + pAdvancedStatsTextBox->getRect().getHeight() + ADVANCED_VPAD, false);
 
         LLMotion *motion = NULL;
         const LLInventoryItem* item = getItem();