Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 27 insertions, 27 deletions

diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index df1b2be955..3f3e1766b4 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -58,26 +58,26 @@ LLPreview::LLPreview(const LLSD& key)
     mItemUUID(key.has("itemid") ? key.get("itemid").asUUID() : key.asUUID()),
     mObjectUUID(),          // set later by setObjectID()
     mCopyToInvBtn( NULL ),
-    mForceClose(FALSE),
-    mUserResized(FALSE),
-    mCloseAfterSave(FALSE),
+    mForceClose(false),
+    mUserResized(false),
+    mCloseAfterSave(false),
     mAssetStatus(PREVIEW_ASSET_UNLOADED),
-    mDirty(TRUE),
-    mSaveDialogShown(FALSE)
+    mDirty(true),
+    mSaveDialogShown(false)
 {
     mAuxItem = new LLInventoryItem;
     // don't necessarily steal focus on creation -- sometimes these guys pop up without user action
-    setAutoFocus(FALSE);
+    setAutoFocus(false);
 
     gInventory.addObserver(this);
 
     refreshFromItem();
 }
 
-BOOL LLPreview::postBuild()
+bool LLPreview::postBuild()
 {
     refreshFromItem();
-    return TRUE;
+    return true;
 }
 
 LLPreview::~LLPreview()
@@ -142,7 +142,7 @@ void LLPreview::onCommit()
         if (!item->isFinished())
         {
             // We are attempting to save an item that was never loaded
-            LL_WARNS() << "LLPreview::onCommit() called with mIsComplete == FALSE"
+            LL_WARNS() << "LLPreview::onCommit() called with mIsComplete == false"
                     << " Type: " << item->getType()
                     << " ID: " << item->getUUID()
                     << LL_ENDL;
@@ -172,7 +172,7 @@ void LLPreview::onCommit()
         }
         else if(item->getPermissions().getOwner() == gAgent.getID())
         {
-            new_item->updateServer(FALSE);
+            new_item->updateServer(false);
             gInventory.updateItem(new_item);
             gInventory.notifyObservers();
 
@@ -186,7 +186,7 @@ void LLPreview::onCommit()
                     if( obj )
                     {
                         LLSelectMgr::getInstance()->deselectAll();
-                        LLSelectMgr::getInstance()->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
+                        LLSelectMgr::getInstance()->addAsIndividual( obj, SELECT_ALL_TES, false );
                         LLSelectMgr::getInstance()->selectionSetObjectDescription( getChild<LLUICtrl>("desc")->getValue().asString() );
 
                         LLSelectMgr::getInstance()->deselectAll();
@@ -199,7 +199,7 @@ void LLPreview::onCommit()
 
 void LLPreview::changed(U32 mask)
 {
-    mDirty = TRUE;
+    mDirty = true;
 }
 
 void LLPreview::setNotecardInfo(const LLUUID& notecard_inv_id,
@@ -214,7 +214,7 @@ void LLPreview::draw()
     LLFloater::draw();
     if (mDirty)
     {
-        mDirty = FALSE;
+        mDirty = false;
         refreshFromItem();
     }
 }
@@ -239,7 +239,7 @@ void LLPreview::refreshFromItem()
 }
 
 // static
-BOOL LLPreview::canModify(const LLUUID taskUUID, const LLInventoryItem* item)
+bool LLPreview::canModify(const LLUUID taskUUID, const LLInventoryItem* item)
 {
     const LLViewerObject* object = nullptr;
     if (taskUUID.notNull())
@@ -251,12 +251,12 @@ BOOL LLPreview::canModify(const LLUUID taskUUID, const LLInventoryItem* item)
 }
 
 // static
-BOOL LLPreview::canModify(const LLViewerObject* object, const LLInventoryItem* item)
+bool LLPreview::canModify(const LLViewerObject* object, const LLInventoryItem* item)
 {
     if (object && !object->permModify())
     {
         // No permission to edit in-world inventory
-        return FALSE;
+        return false;
     }
 
     return item && gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE);
@@ -277,7 +277,7 @@ void LLPreview::onRadio(LLUICtrl*, void* userdata)
 }
 
 // static
-void LLPreview::hide(const LLUUID& item_uuid, BOOL no_saving /* = FALSE */ )
+void LLPreview::hide(const LLUUID& item_uuid, bool no_saving /* = false */ )
 {
     LLFloater* floater = LLFloaterReg::findInstance("preview", LLSD(item_uuid));
     if (!floater) floater = LLFloaterReg::findInstance("preview_avatar", LLSD(item_uuid));
@@ -287,7 +287,7 @@ void LLPreview::hide(const LLUUID& item_uuid, BOOL no_saving /* = FALSE */ )
     {
         if ( no_saving )
         {
-            preview->mForceClose = TRUE;
+            preview->mForceClose = true;
         }
         preview->closeFloater();
     }
@@ -302,11 +302,11 @@ void LLPreview::dirty(const LLUUID& item_uuid)
     LLPreview* preview = dynamic_cast<LLPreview*>(floater);
     if(preview)
     {
-        preview->mDirty = TRUE;
+        preview->mDirty = true;
     }
 }
 
-BOOL LLPreview::handleMouseDown(S32 x, S32 y, MASK mask)
+bool LLPreview::handleMouseDown(S32 x, S32 y, MASK mask)
 {
     if(mClientRect.pointInRect(x, y))
     {
@@ -318,22 +318,22 @@ BOOL LLPreview::handleMouseDown(S32 x, S32 y, MASK mask)
         S32 screen_y;
         localPointToScreen(x, y, &screen_x, &screen_y );
         LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y);
-        return TRUE;
+        return true;
     }
     return LLFloater::handleMouseDown(x, y, mask);
 }
 
-BOOL LLPreview::handleMouseUp(S32 x, S32 y, MASK mask)
+bool LLPreview::handleMouseUp(S32 x, S32 y, MASK mask)
 {
     if(hasMouseCapture())
     {
         gFocusMgr.setMouseCapture(NULL);
-        return TRUE;
+        return true;
     }
     return LLFloater::handleMouseUp(x, y, mask);
 }
 
-BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
+bool LLPreview::handleHover(S32 x, S32 y, MASK mask)
 {
     if(hasMouseCapture())
     {
@@ -442,7 +442,7 @@ void LLPreview::onDiscardBtn(void* data)
     const LLInventoryItem* item = self->getItem();
     if (!item) return;
 
-    self->mForceClose = TRUE;
+    self->mForceClose = true;
     self->closeFloater();
 
     // Move the item to the trash
@@ -460,7 +460,7 @@ void LLPreview::onDiscardBtn(void* data)
         new_item->setParent(trash_id);
         // no need to restamp it though it's a move into trash because
         // it's a brand new item already.
-        new_item->updateParentOnServer(FALSE);
+        new_item->updateParentOnServer(false);
         gInventory.updateItem(new_item);
         gInventory.notifyObservers();
     }
@@ -495,7 +495,7 @@ LLMultiPreview::LLMultiPreview()
     }
     setTitle(LLTrans::getString("MultiPreviewTitle"));
     buildTabContainer();
-    setCanResize(TRUE);
+    setCanResize(true);
 }
 
 void LLMultiPreview::onOpen(const LLSD& key)