Merge branch 'develop' into nat/edu-channel

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 408eac6289..b06e35f65d 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -53,7 +53,7 @@
 LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)
 :   LLFloater(key),
     mPanelInventoryObject(NULL),
-    mDirty(TRUE)
+    mDirty(true)
 {
     mCommitCallbackRegistrar.add("OpenObject.MoveToInventory",  boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this));
     mCommitCallbackRegistrar.add("OpenObject.Cancel",           boost::bind(&LLFloaterOpenObject::onClickCancel, this));
@@ -65,13 +65,13 @@ LLFloaterOpenObject::~LLFloaterOpenObject()
 }
 
 // virtual
-BOOL LLFloaterOpenObject::postBuild()
+bool LLFloaterOpenObject::postBuild()
 {
     getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
     mPanelInventoryObject = getChild<LLPanelObjectInventory>("object_contents");
 
     refresh();
-    return TRUE;
+    return true;
 }
 
 void LLFloaterOpenObject::onOpen(const LLSD& key)
@@ -97,18 +97,18 @@ void LLFloaterOpenObject::refresh()
     mPanelInventoryObject->refresh();
 
     std::string name = "";
-    BOOL enabled = FALSE;
+    bool enabled = false;
 
     LLSelectNode* node = mObjectSelection->getFirstRootNode();
     if (node)
     {
         name = node->mName;
-        enabled = TRUE;
+        enabled = true;
     }
     else
     {
         name = "";
-        enabled = FALSE;
+        enabled = false;
     }
 
     getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", name);
@@ -123,14 +123,14 @@ void LLFloaterOpenObject::draw()
     if (mDirty)
     {
         refresh();
-        mDirty = FALSE;
+        mDirty = false;
     }
     LLFloater::draw();
 }
 
 void LLFloaterOpenObject::dirty()
 {
-    mDirty = TRUE;
+    mDirty = true;
 }
 
 
@@ -184,9 +184,9 @@ void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category
 
     // Copy and/or move the items into the newly created folder.
     // Ignore any "you're going to break this item" messages.
-    BOOL success = move_inv_category_world_to_agent(object_id,
+    bool success = move_inv_category_world_to_agent(object_id,
                                                     category_id,
-                                                    TRUE,
+                                                    true,
                                                     [](S32 result, void* data, const LLMoveInv*)
                                                     {
                                                         callbackMoveInventory(result, data);