miscellaneous: BOOL (int) to real bool

30 files changed, 126 insertions, 126 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index e7234303a8..cdb4130d42 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -103,7 +103,7 @@ using namespace LLAvatarAppearanceDefines;
 
 extern LLMenuBarGL* gMenuBarView;
 
-const BOOL ANIMATE = TRUE;
+const bool ANIMATE = true;
 const U8 AGENT_STATE_TYPING =	0x04;
 const U8 AGENT_STATE_EDITING =  0x10;
 
@@ -373,7 +373,7 @@ bool LLAgent::isMicrophoneOn(const LLSD& sdname)
 //-----------------------------------------------------------------------------
 LLAgent::LLAgent() :
 	mGroupPowers(0),
-	mHideGroupTitle(FALSE),
+	mHideGroupTitle(false),
 	mGroupID(),
 
 	mInitialized(false),
@@ -417,24 +417,24 @@ LLAgent::LLAgent() :
 	mRenderState(0),
 	mTypingTimer(),
 
-	mViewsPushed(FALSE),
+	mViewsPushed(false),
 
-	mCustomAnim(FALSE),
-	mShowAvatar(TRUE),
+	mCustomAnim(false),
+	mShowAvatar(true),
 	mFrameAgent(),
 
 	mIsDoNotDisturb(false),
 
 	mControlFlags(0x00000000),
-	mbFlagsDirty(FALSE),
-	mbFlagsNeedReset(FALSE),
+	mbFlagsDirty(false),
+	mbFlagsNeedReset(false),
 
-	mAutoPilot(FALSE),
-	mAutoPilotFlyOnStop(FALSE),
-	mAutoPilotAllowFlying(TRUE),
+	mAutoPilot(false),
+	mAutoPilotFlyOnStop(false),
+	mAutoPilotAllowFlying(true),
 	mAutoPilotTargetGlobal(),
 	mAutoPilotStopDistance(1.f),
-	mAutoPilotUseRotation(FALSE),
+	mAutoPilotUseRotation(false),
 	mAutoPilotTargetFacing(LLVector3::zero),
 	mAutoPilotTargetDist(0.f),
 	mAutoPilotNoProgressFrameCount(0),
@@ -442,18 +442,18 @@ LLAgent::LLAgent() :
 	mAutoPilotFinishedCallback(NULL),
 	mAutoPilotCallbackData(NULL),
 	
-	mMovementKeysLocked(FALSE),
+	mMovementKeysLocked(false),
 
 	mEffectColor(new LLUIColor(LLColor4(0.f, 1.f, 1.f, 1.f))),
 
-	mHaveHomePosition(FALSE),
+	mHaveHomePosition(false),
 	mHomeRegionHandle( 0 ),
 	mNearChatRadius(CHAT_NORMAL_RADIUS / 2.f),
 
 	mNextFidgetTime(0.f),
 	mCurrentFidget(0),
 	mFirstLogin(false),
-	mOutfitChosen(FALSE),
+	mOutfitChosen(false),
 
 	mVoiceConnected(false),
 
@@ -481,7 +481,7 @@ void LLAgent::init()
 {
 	mMoveTimer.start();
 
-	gSavedSettings.declareBOOL("SlowMotionAnimation", FALSE, "Declared in code", LLControlVariable::PERSIST_NO);
+	gSavedSettings.declareBOOL("SlowMotionAnimation", false, "Declared in code", LLControlVariable::PERSIST_NO);
 	gSavedSettings.getControl("SlowMotionAnimation")->getSignal()->connect(boost::bind(&handleSlowMotionAnimation, _2));
 	
 	// *Note: this is where LLViewerCamera::getInstance() used to be constructed.
@@ -847,20 +847,20 @@ void LLAgent::movePitch(F32 mag)
 
 
 // Does this parcel allow you to fly?
-BOOL LLAgent::canFly()
+bool LLAgent::canFly()
 {
-	if (isGodlike()) return TRUE;
+	if (isGodlike()) return true;
 
 	LLViewerRegion* regionp = getRegion();
-	if (regionp && regionp->getBlockFly()) return FALSE;
+	if (regionp && regionp->getBlockFly()) return false;
 	
 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-	if (!parcel) return FALSE;
+	if (!parcel) return false;
 
 	// Allow owners to fly on their own land.
 	if (LLViewerParcelMgr::isParcelOwnedByAgent(parcel, GP_LAND_ALLOW_FLY))
 	{
-		return TRUE;
+		return true;
 	}
 
 	return parcel->getAllowFly();
@@ -952,7 +952,7 @@ void LLAgent::toggleFlying()
 // static
 bool LLAgent::enableFlying()
 {
-	BOOL sitting = FALSE;
+	bool sitting = false;
 	if (isAgentAvatarValid())
 	{
 		sitting = gAgentAvatarp->isSitting();
@@ -963,7 +963,7 @@ bool LLAgent::enableFlying()
 // static
 bool LLAgent::isSitting()
 {
-    BOOL sitting = FALSE;
+    bool sitting = false;
     if (isAgentAvatarValid())
     {
         sitting = gAgentAvatarp->isSitting();
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index fd3a9b1d7b..c1162c1609 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -43,7 +43,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
-extern const BOOL 	ANIMATE;
+extern const bool 	ANIMATE;
 extern const U8 	AGENT_STATE_TYPING;  // Typing indication
 extern const U8 	AGENT_STATE_EDITING; // Set when agent has objects selected
 
@@ -356,7 +356,7 @@ public:
 	void			setFlying(BOOL fly, BOOL fail_sound = FALSE);
 	static void		toggleFlying();
 	static bool		enableFlying();
-	BOOL			canFly(); 			// Does this parcel allow you to fly?
+	bool			canFly(); 			// Does this parcel allow you to fly?
 	static bool		isSitting();
 
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index db99f20775..8bd9169c7d 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -76,7 +76,7 @@ void set_default_permissions(LLViewerInventoryItem* item)
 
 		item->setPermissions(perm);
 
-		item->updateServer(FALSE);
+		item->updateServer(false);
 	}
 }
 
@@ -304,7 +304,7 @@ void LLAgentWearables::addWearabletoAgentInventoryDone(const LLWearableType::ETy
 		item->setAssetUUID(wearable->getAssetID());
 		item->setTransactionID(wearable->getTransactionID());
 		gInventory.addChangedMask(LLInventoryObserver::INTERNAL, item_id);
-		item->updateServer(FALSE);
+		item->updateServer(false);
 	}
 	gInventory.notifyObservers();
 }
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 17e1a27934..26c717c0ad 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -1678,7 +1678,7 @@ void AISUpdate::doUpdate()
                 LLPointer<LLViewerInventoryItem> new_item = lost_it->second;
 
                 new_item->setParent(lost_uuid);
-                new_item->updateParentOnServer(FALSE);
+                new_item->updateParentOnServer(false);
             }
         }
     }
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4c3a9229d2..6545b1d278 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1336,7 +1336,7 @@ void LLWearableHoldingPattern::onWearableAssetFetch(LLViewerWearable *wearable)
 					wearable_item->setAssetUUID(new_wearable->getAssetID());
 					wearable_item->setTransactionID(new_wearable->getTransactionID());
 					gInventory.updateItem(wearable_item, LLInventoryObserver::INTERNAL);
-					wearable_item->updateServer(FALSE);
+					wearable_item->updateServer(false);
 
 					use_count++;
 				}
@@ -4231,12 +4231,12 @@ bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_b
 
 	// FIXME switch to use AISv3 where supported.
 	//items need to be updated on a dataserver
-	item->setComplete(TRUE);
-	item->updateServer(FALSE);
+	item->setComplete(true);
+	item->updateServer(false);
 	gInventory.updateItem(item);
 
-	swap_item->setComplete(TRUE);
-	swap_item->updateServer(FALSE);
+	swap_item->setComplete(true);
+	swap_item->updateServer(false);
 	gInventory.updateItem(swap_item);
 
 	//to cause appearance of the agent to be updated
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 0cbfad8b73..3f426327b0 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -80,7 +80,7 @@ public:
 	virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; }
 	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
 	virtual BOOL isItemRenameable() const { return TRUE; }
-	virtual BOOL renameItem(const std::string& new_name) { mName = new_name; mNeedsRefresh = true; return TRUE; }
+	virtual bool renameItem(const std::string& new_name) { mName = new_name; mNeedsRefresh = true; return true; }
 	virtual BOOL isItemMovable( void ) const { return FALSE; }
 	virtual BOOL isItemRemovable( void ) const { return FALSE; }
 	virtual BOOL isItemInTrash( void) const { return FALSE; }
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index f926a8a6d5..1c9dd652d8 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -356,8 +356,8 @@ public:
 		{
 			LLFavoritesOrderStorage::instance().setSortIndex(item, mSortField);
 
-			item->setComplete(TRUE);
-			item->updateServer(FALSE);
+			item->setComplete(true);
+			item->updateServer(false);
 
 			gInventory.updateItem(item);
 			gInventory.notifyObservers();
@@ -662,8 +662,8 @@ void LLFavoritesBarCtrl::handleNewFavoriteDragAndDrop(LLInventoryItem *item, con
 		{
 			LLFavoritesOrderStorage::instance().setSortIndex(currItem, ++sortField);
 
-			currItem->setComplete(TRUE);
-			currItem->updateServer(FALSE);
+			currItem->setComplete(true);
+			currItem->updateServer(false);
 
 			gInventory.updateItem(currItem);
 		}
@@ -1478,7 +1478,7 @@ bool LLFavoritesBarCtrl::onRenameCommit(const LLSD& notification, const LLSD& re
         {
             LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
             new_item->rename(landmark_name);
-            new_item->updateServer(FALSE);
+            new_item->updateServer(false);
             gInventory.updateItem(new_item);
         }
     }
@@ -2039,8 +2039,8 @@ void LLFavoritesOrderStorage::saveItemsOrder( const LLInventoryModel::item_array
 
 		setSortIndex(item, ++sortField);
 
-		item->setComplete(TRUE);
-		item->updateServer(FALSE);
+		item->setComplete(true);
+		item->updateServer(false);
 
 		gInventory.updateItem(item);
 
diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp
index b82d8a29ba..6faa659d87 100644
--- a/indra/newview/llfloatercreatelandmark.cpp
+++ b/indra/newview/llfloatercreatelandmark.cpp
@@ -345,7 +345,7 @@ void LLFloaterCreateLandmark::onSaveClicked()
 		gInventory.accountForUpdate(update);
 
 		new_item->setParent(folder_id);
-		new_item->updateParentOnServer(FALSE);
+		new_item->updateParentOnServer(false);
 	}
 
     removeObserver();
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index f29046c513..2ebe67e600 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -85,7 +85,7 @@ public:
 			perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("Gestures"));
 			perm.setMaskGroup(LLFloaterPerms::getGroupPerms("Gestures"));
 			item->setPermissions(perm);
-			item->updateServer(FALSE);
+			item->updateServer(false);
 		}
 	}
 };
@@ -678,7 +678,7 @@ void LLFloaterGesture::onDeleteSelected()
 			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);
 		}
 	}
diff --git a/indra/newview/llfloatermyenvironment.cpp b/indra/newview/llfloatermyenvironment.cpp
index 21d106c8b1..ba1ca868bc 100644
--- a/indra/newview/llfloatermyenvironment.cpp
+++ b/indra/newview/llfloatermyenvironment.cpp
@@ -247,7 +247,7 @@ void LLFloaterMyEnvironment::onDeleteSelected()
 
             LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(inv_item);
             new_item->setParent(trash_id);
-            new_item->updateParentOnServer(FALSE);
+            new_item->updateParentOnServer(false);
             gInventory.updateItem(new_item);
         }
     }
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index b44fcf3e03..2f2b5a7b88 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2114,14 +2114,14 @@ BOOL LLItemBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLItemBridge::renameItem(const std::string& new_name)
+bool LLItemBridge::renameItem(const std::string& new_name)
 {
 	if(!isItemRenameable())
-		return FALSE;
+		return false;
 	LLPreview::dirty(mUUID);
 	LLInventoryModel* model = getInventoryModel();
 	if(!model)
-		return FALSE;
+		return false;
 	LLViewerInventoryItem* item = getItem();
 	if(item && (item->getName() != new_name))
 	{
@@ -2129,9 +2129,9 @@ BOOL LLItemBridge::renameItem(const std::string& new_name)
 		updates["name"] = new_name;
 		update_inventory_item(item->getUUID(),updates, NULL);
 	}
-	// return FALSE because we either notified observers (& therefore
+	// return false because we either notified observers (& therefore
 	// rebuilt) or we didn't update.
-	return FALSE;
+	return false;
 }
 
 BOOL LLItemBridge::removeItem()
@@ -3767,7 +3767,7 @@ LLUIImagePtr LLFolderBridge::getIconOverlay() const
 	return NULL;
 }
 
-BOOL LLFolderBridge::renameItem(const std::string& new_name)
+bool LLFolderBridge::renameItem(const std::string& new_name)
 {
 
 	LLScrollOnRenameObserver *observer = new LLScrollOnRenameObserver(mUUID, mRoot);
@@ -3775,9 +3775,9 @@ BOOL LLFolderBridge::renameItem(const std::string& new_name)
 
 	rename_category(getInventoryModel(), mUUID, new_name);
 
-	// return FALSE because we either notified observers (& therefore
+	// return false because we either notified observers (& therefore
 	// rebuilt) or we didn't update.
-	return FALSE;
+	return false;
 }
 
 BOOL LLFolderBridge::removeItem()
@@ -6907,20 +6907,20 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	hide_context_entries(menu, items, disabled_items);
 }
 
-BOOL LLObjectBridge::renameItem(const std::string& new_name)
+bool LLObjectBridge::renameItem(const std::string& new_name)
 {
 	if(!isItemRenameable())
-		return FALSE;
+		return false;
 	LLPreview::dirty(mUUID);
 	LLInventoryModel* model = getInventoryModel();
 	if(!model)
-		return FALSE;
+		return false;
 	LLViewerInventoryItem* item = getItem();
 	if(item && (item->getName() != new_name))
 	{
 		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 		new_item->rename(new_name);
-		new_item->updateServer(FALSE);
+		new_item->updateServer(false);
 		model->updateItem(new_item);
 		model->notifyObservers();
 		buildDisplayName();
@@ -6939,7 +6939,7 @@ BOOL LLObjectBridge::renameItem(const std::string& new_name)
 	}
 	// return FALSE because we either notified observers (& therefore
 	// rebuilt) or we didn't update.
-	return FALSE;
+	return false;
 }
 
 // +=================================================+
@@ -6973,7 +6973,7 @@ LLWearableBridge::LLWearableBridge(LLInventoryPanel* inventory,
 	mInvType = inv_type;
 }
 
-BOOL LLWearableBridge::renameItem(const std::string& new_name)
+bool LLWearableBridge::renameItem(const std::string& new_name)
 {
 	if (get_is_item_worn(mUUID))
 	{
@@ -7427,7 +7427,7 @@ void LLSettingsBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
     hide_context_entries(menu, items, disabled_items);
 }
 
-BOOL LLSettingsBridge::renameItem(const std::string& new_name)
+bool LLSettingsBridge::renameItem(const std::string& new_name)
 {
     /*TODO: change internal settings name? */
     return LLItemBridge::renameItem(new_name);
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 3cbbd68e51..854113df5c 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -113,7 +113,7 @@ public:
 	virtual void showProperties();
 	virtual BOOL isItemRenameable() const { return TRUE; }
 	virtual BOOL isMultiPreviewAllowed() { return TRUE; }
-	//virtual BOOL renameItem(const std::string& new_name) {}
+	//virtual bool renameItem(const std::string& new_name) {}
 	virtual BOOL isItemRemovable() const;
 	virtual BOOL isItemMovable() const;
 	virtual BOOL isItemInTrash() const;
@@ -247,7 +247,7 @@ public:
 	virtual PermissionMask getPermissionMask() const;
 	virtual time_t getCreationDate() const;
 	virtual BOOL isItemRenameable() const;
-	virtual BOOL renameItem(const std::string& new_name);
+	virtual bool renameItem(const std::string& new_name);
 	virtual BOOL removeItem();
     virtual bool isItemCopyable(bool can_copy_as_link = true) const;
 	virtual bool hasChildren() const { return FALSE; }
@@ -305,7 +305,7 @@ public:
 
 	void setShowDescendantsCount(bool show_count) {mShowDescendantsCount = show_count;}
 
-	virtual BOOL renameItem(const std::string& new_name);
+	virtual bool renameItem(const std::string& new_name);
 
 	virtual BOOL removeItem();
 	BOOL removeSystemFolder();
@@ -522,7 +522,7 @@ public:
     virtual BOOL isItemWearable() const { return TRUE; }
 	virtual std::string getLabelSuffix() const;
 	virtual void			buildContextMenu(LLMenuGL& menu, U32 flags);
-	virtual BOOL renameItem(const std::string& new_name);
+	virtual bool renameItem(const std::string& new_name);
 	LLInventoryObject* getObject() const;
 protected:
 	static LLUUID sContextMenuItemID;  // Only valid while the context menu is open.
@@ -555,7 +555,7 @@ public:
     virtual BOOL isItemWearable() const { return TRUE; }
 	virtual void	buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual std::string getLabelSuffix() const;
-	virtual BOOL renameItem(const std::string& new_name);
+	virtual bool renameItem(const std::string& new_name);
 	virtual LLWearableType::EType getWearableType() const { return mWearableType; }
 
 	static void		onWearOnAvatar( void* userdata );	// Access to wearOnAvatar() from menu
@@ -632,7 +632,7 @@ public:
     virtual void	openItem();
     virtual BOOL	isMultiPreviewAllowed() { return FALSE; }
     virtual void	buildContextMenu(LLMenuGL& menu, U32 flags);
-    virtual BOOL    renameItem(const std::string& new_name);
+    virtual bool    renameItem(const std::string& new_name);
     virtual BOOL    isItemRenameable() const;
     virtual LLSettingsType::type_e getSettingsType() const { return mSettingsType; }
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 4aeacae6ed..7056eeb496 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2066,7 +2066,7 @@ void change_item_parent(const LLUUID& item_id, const LLUUID& new_parent_id)
 
 		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(inv_item);
 		new_item->setParent(new_parent_id);
-		new_item->updateParentOnServer(FALSE);
+		new_item->updateParentOnServer(false);
 		gInventory.updateItem(new_item);
 		gInventory.notifyObservers();
 	}
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 05aa2e423f..fef0366868 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1474,7 +1474,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
 		{
 			// Parent id at server is null, so update server even if item already is in the same folder
 			old_item->setParent(new_parent_id);
-			new_item->updateParentOnServer(FALSE);
+			new_item->updateParentOnServer(false);
 		}
 		mask |= LLInventoryObserver::INTERNAL;
 	}
@@ -1495,7 +1495,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
 				gInventory.accountForUpdate(update);
 
 				// *FIX: bit of a hack to call update server from here...
-				new_item->updateParentOnServer(FALSE);
+				new_item->updateParentOnServer(false);
 				item_array->push_back(new_item);
 			}
 			else
@@ -1540,7 +1540,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
 					gInventory.accountForUpdate(update);
 					// *FIX: bit of a hack to call update server from
 					// here...
-					new_item->updateParentOnServer(FALSE);
+					new_item->updateParentOnServer(false);
 					item_array->push_back(new_item);
 				}
 				else
@@ -3040,10 +3040,10 @@ void LLInventoryModel::buildParentChildMap()
 		// FIXME note that updateServer() fails with protected
 		// types, so this will not work as intended in that case.
 		// UpdateServer uses AIS, AIS cat move is not implemented yet
-		// cat->updateServer(TRUE);
+		// cat->updateServer(true);
 
 		// MoveInventoryFolder message, intentionally per item
-		cat->updateParentOnServer(FALSE);
+		cat->updateParentOnServer(false);
 		catsp = getUnlockedCatArray(cat->getParentUUID());
 		if(catsp)
 		{
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 1f410bea10..2b4bef278e 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -1332,7 +1332,7 @@ void BGFolderHttpHandler::processData(LLSD & content, LLCore::HttpResponse * res
                         gInventory.accountForUpdate(update);
 
                         titem->setParent(lost_uuid);
-                        titem->updateParentOnServer(FALSE);
+                        titem->updateParentOnServer(false);
                         gInventory.updateItem(titem);
                     }
                 }
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index cc3c51dd83..cea078bc23 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -545,7 +545,7 @@ void LLPanelLandmarkInfo::collectLandmarkFolders(LLInventoryModel::cat_array_t&
 	gInventory.accountForUpdate(update);
 
 	mItem->setParent(mNewParentId);
-	mItem->updateParentOnServer(FALSE);
+	mItem->updateParentOnServer(false);
 
 	gInventory.updateItem(mItem);
 	gInventory.notifyObservers();
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index f3a41f2e25..18e134e4e4 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -128,7 +128,7 @@ public:
 	virtual void selectItem() {}
     virtual void navigateToFolder(bool new_window = false, bool change_mode = false) {}
 	virtual BOOL isItemRenameable() const;
-	virtual BOOL renameItem(const std::string& new_name);
+	virtual bool renameItem(const std::string& new_name);
 	virtual BOOL isItemMovable() const;
 	virtual BOOL isItemRemovable() const;
 	virtual BOOL removeItem();
@@ -304,7 +304,7 @@ BOOL LLTaskInvFVBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
+bool LLTaskInvFVBridge::renameItem(const std::string& new_name)
 {
 	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
 	if(object)
@@ -322,7 +322,7 @@ BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
 				false);
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 BOOL LLTaskInvFVBridge::isItemMovable() const
@@ -333,7 +333,7 @@ BOOL LLTaskInvFVBridge::isItemMovable() const
 	//	return TRUE;
 	//}
 	//return FALSE;
-	return TRUE;
+	return true;
 }
 
 BOOL LLTaskInvFVBridge::isItemRemovable() const
@@ -587,7 +587,7 @@ public:
 	virtual const std::string& getDisplayName() const;
 	virtual BOOL isItemRenameable() const;
 	// virtual BOOL isItemCopyable() const { return FALSE; }
-	virtual BOOL renameItem(const std::string& new_name);
+	virtual bool renameItem(const std::string& new_name);
 	virtual BOOL isItemRemovable() const;
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual bool hasChildren() const;
@@ -643,9 +643,9 @@ BOOL LLTaskCategoryBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLTaskCategoryBridge::renameItem(const std::string& new_name)
+bool LLTaskCategoryBridge::renameItem(const std::string& new_name)
 {
-	return FALSE;
+	return false;
 }
 
 BOOL LLTaskCategoryBridge::isItemRemovable() const
@@ -906,7 +906,7 @@ public:
 		LLTaskInvFVBridge(panel, uuid, name) {}
 
 	virtual BOOL isItemRenameable() const;
-	virtual BOOL renameItem(const std::string& new_name);
+	virtual bool renameItem(const std::string& new_name);
 };
 
 BOOL LLTaskCallingCardBridge::isItemRenameable() const
@@ -914,9 +914,9 @@ BOOL LLTaskCallingCardBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLTaskCallingCardBridge::renameItem(const std::string& new_name)
+bool LLTaskCallingCardBridge::renameItem(const std::string& new_name)
 {
-	return FALSE;
+	return false;
 }
 
 
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 67f913a067..8a8518ce0d 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -1175,7 +1175,7 @@ void LLPanelPermissions::onCommitName(LLUICtrl*, void* data)
 		{
 			LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 			new_item->rename(tb->getText());
-			new_item->updateServer(FALSE);
+			new_item->updateServer(false);
 			gInventory.updateItem(new_item);
 			gInventory.notifyObservers();
 		}
@@ -1202,7 +1202,7 @@ void LLPanelPermissions::onCommitDesc(LLUICtrl*, void* data)
 		{
 			LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 			new_item->setDescription(le->getText());
-			new_item->updateServer(FALSE);
+			new_item->updateServer(false);
 			gInventory.updateItem(new_item);
 			gInventory.notifyObservers();
 		}
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 1d5ed93c4d..b603c361d8 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -831,7 +831,7 @@ void LLPanelPlaces::onSaveButtonClicked()
 		gInventory.accountForUpdate(update);
 
 		new_item->setParent(folder_id);
-		new_item->updateParentOnServer(FALSE);
+		new_item->updateParentOnServer(false);
 	}
 
 	gInventory.updateItem(new_item);
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 0117db86e8..fd552d8b7a 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -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();
 
@@ -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();
 	}
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index 544ff8b5dc..2e40455a46 100644
--- a/indra/newview/llpreviewgesture.cpp
+++ b/indra/newview/llpreviewgesture.cpp
@@ -1196,7 +1196,7 @@ void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data,
 				new_item->setDescription(info->mDesc);
 				new_item->setTransactionID(info->mTransactionID);
 				new_item->setAssetUUID(asset_uuid);
-				new_item->updateServer(FALSE);
+				new_item->updateServer(false);
 				gInventory.updateItem(new_item);
 				gInventory.notifyObservers();
 			}
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 6681703625..1a613afbb8 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -659,7 +659,7 @@ void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data
 				LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 				new_item->setAssetUUID(asset_uuid);
 				new_item->setTransactionID(info->mTransactionID);
-				new_item->updateServer(FALSE);
+				new_item->updateServer(false);
 				gInventory.updateItem(new_item);
 				gInventory.notifyObservers();
 			}
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index d172a87b1d..61508f8648 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4185,14 +4185,14 @@ void LLSelectMgr::selectGetAggregateSaleInfo(U32 &num_for_sale,
 		return;
 	
 	LLSelectNode *node = *(getSelection()->root_begin());
-	const BOOL first_node_for_sale = node->mSaleInfo.isForSale();
+	const bool first_node_for_sale = node->mSaleInfo.isForSale();
 	const S32 first_node_sale_price = node->mSaleInfo.getSalePrice();
 	
 	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
 		 iter != getSelection()->root_end(); iter++)
 	{
 		LLSelectNode* node = *iter;
-		const BOOL node_for_sale = node->mSaleInfo.isForSale();
+		const bool node_for_sale = node->mSaleInfo.isForSale();
 		const S32 node_sale_price = node->mSaleInfo.getSalePrice();
 		
 		// Set mixed if the fields don't match the first node's fields.
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 7009fb98ab..4df80cb2b9 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -181,7 +181,7 @@ void LLSettingsVOBase::onInventoryItemCreated(const LLUUID &inventoryId, LLSetti
         {
             perm.setMaskEveryone(PERM_COPY);
             pitem->setPermissions(perm);
-            pitem->updateServer(FALSE);
+            pitem->updateServer(false);
         }
     }
     if (!settings)
@@ -240,7 +240,7 @@ void LLSettingsVOBase::updateInventoryItem(const LLSettingsBase::ptr_t &settings
         }
         if (need_update)
         {
-            new_item->updateServer(FALSE);
+            new_item->updateServer(false);
             gInventory.updateItem(new_item);
             gInventory.notifyObservers();
         }
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index d6d5a4ef2d..298fac1bfe 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -673,7 +673,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 	///////////////
 
 	const LLSaleInfo& sale_info = item->getSaleInfo();
-	BOOL is_for_sale = sale_info.isForSale();
+	bool is_for_sale = sale_info.isForSale();
 	LLComboBox* combo_sale_type = getChild<LLComboBox>("ComboBoxSaleType");
 	LLUICtrl* edit_cost = getChild<LLUICtrl>("Edit Cost");
 
@@ -1144,7 +1144,7 @@ void LLSidepanelItemInfo::onCommitChanges(LLPointer<LLViewerInventoryItem> item)
         mUpdatePendingId++;
         LLPointer<LLInventoryCallback> callback = new PropertiesChangedCallback(getHandle(), mItemID, mUpdatePendingId);
         update_inventory_item(item.get(), callback);
-        //item->updateServer(FALSE);
+        //item->updateServer(false);
         gInventory.updateItem(item);
         gInventory.notifyObservers();
     }
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 3b50dc354f..eefe050d46 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -406,7 +406,7 @@ void LLViewerInventoryItem::cloneViewerItem(LLPointer<LLViewerInventoryItem>& ne
 	}
 }
 
-void LLViewerInventoryItem::updateServer(BOOL is_new) const
+void LLViewerInventoryItem::updateServer(bool is_new) const
 {
 	if(!mIsComplete)
 	{
@@ -494,24 +494,24 @@ void LLViewerInventoryItem::fetchFromServer(void) const
 }
 
 // virtual
-BOOL LLViewerInventoryItem::unpackMessage(const LLSD& item)
+bool LLViewerInventoryItem::unpackMessage(const LLSD& item)
 {
 	BOOL rv = LLInventoryItem::fromLLSD(item);
 
 	LLLocalizedInventoryItemsDictionary::getInstance()->localizeInventoryObjectName(mName);
 
-	mIsComplete = TRUE;
+	mIsComplete = true;
 	return rv;
 }
 
 // virtual
-BOOL LLViewerInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num)
+bool LLViewerInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num)
 {
 	BOOL rv = LLInventoryItem::unpackMessage(msg, block, block_num);
 
 	LLLocalizedInventoryItemsDictionary::getInstance()->localizeInventoryObjectName(mName);
 
-	mIsComplete = TRUE;
+	mIsComplete = true;
 	return rv;
 }
 
@@ -547,7 +547,7 @@ bool LLViewerInventoryItem::importLegacyStream(std::istream& input_stream)
 	return rv;
 }
 
-void LLViewerInventoryItem::updateParentOnServer(BOOL restamp) const
+void LLViewerInventoryItem::updateParentOnServer(bool restamp) const
 {
 	LLMessageSystem* msg = gMessageSystem;
 	msg->newMessageFast(_PREHASH_MoveInventoryItem);
@@ -628,7 +628,7 @@ void LLViewerInventoryCategory::packMessage(LLMessageSystem* msg) const
 	msg->addStringFast(_PREHASH_Name, mName);
 }
 
-void LLViewerInventoryCategory::updateParentOnServer(BOOL restamp) const
+void LLViewerInventoryCategory::updateParentOnServer(bool restamp) const
 {
 	LLMessageSystem* msg = gMessageSystem;
 	msg->newMessageFast(_PREHASH_MoveInventoryFolder);
@@ -643,7 +643,7 @@ void LLViewerInventoryCategory::updateParentOnServer(BOOL restamp) const
 	gAgent.sendReliableMessage();
 }
 
-void LLViewerInventoryCategory::updateServer(BOOL is_new) const
+void LLViewerInventoryCategory::updateServer(bool is_new) const
 {
 	// communicate that change with the server.
 
@@ -877,9 +877,9 @@ void LLViewerInventoryCategory::localizeName()
 }
 
 // virtual
-BOOL LLViewerInventoryCategory::unpackMessage(const LLSD& category)
+bool LLViewerInventoryCategory::unpackMessage(const LLSD& category)
 {
-	BOOL rv = LLInventoryCategory::fromLLSD(category);
+	bool rv = LLInventoryCategory::fromLLSD(category);
 	localizeName();
 	return rv;
 }
@@ -998,7 +998,7 @@ void set_default_permissions(LLViewerInventoryItem* item, std::string perm_type)
 
 		item->setPermissions(perm);
 
-		item->updateServer(FALSE);
+		item->updateServer(false);
 	}
 }
 
@@ -2141,7 +2141,7 @@ U32 LLViewerInventoryItem::getCRC32() const
 
 // *TODO: mantipov: should be removed with LMSortPrefix patch in llinventorymodel.cpp, EXT-3985
 static char getSeparator() { return '@'; }
-BOOL LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName)
+bool LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName)
 {
 	using std::string;
 	using std::stringstream;
@@ -2149,7 +2149,7 @@ BOOL LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& na
 	const char separator = getSeparator();
 	const string::size_type separatorPos = name.find(separator, 0);
 
-	BOOL result = FALSE;
+	BOOL result = false;
 
 	if (separatorPos < string::npos)
 	{
@@ -2170,7 +2170,7 @@ BOOL LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& na
 			*displayName = name.substr(separatorPos + 1, string::npos);
 		}
 
-		result = TRUE;
+		result = true;
 	}
 
 	return result;
@@ -2319,9 +2319,9 @@ BOOL LLViewerInventoryItem::regenerateLink()
 	{
 	    LLViewerInventoryItem *item = (*item_iter);
 		item->setAssetUUID(target_item_id);
-		item->updateServer(FALSE);
+		item->updateServer(false);
 		gInventory.addChangedMask(LLInventoryObserver::REBUILD, item->getUUID());
 	}
 	gInventory.notifyObservers();
-	return TRUE;
+	return true;
 }
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 7541a0f23c..f700fcc11f 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -56,7 +56,7 @@ public:
 	
 protected:
 	~LLViewerInventoryItem( void ); // ref counted
-	BOOL extractSortFieldAndDisplayName(S32* sortField, std::string* displayName) const { return extractSortFieldAndDisplayName(mName, sortField, displayName); }
+	bool extractSortFieldAndDisplayName(S32* sortField, std::string* displayName) const { return extractSortFieldAndDisplayName(mName, sortField, displayName); }
 	mutable std::string mDisplayName;
 	
 public:
@@ -83,7 +83,7 @@ public:
 	virtual time_t getCreationDate() const;
 	virtual U32 getCRC32() const; // really more of a checksum.
 
-	static BOOL extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName);
+	static bool extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName);
 
 	// construct a complete viewer inventory item
 	LLViewerInventoryItem(const LLUUID& uuid, const LLUUID& parent_uuid,
@@ -125,13 +125,13 @@ public:
 	void cloneViewerItem(LLPointer<LLViewerInventoryItem>& newitem) const;
 
 	// virtual methods
-	virtual void updateParentOnServer(BOOL restamp) const;
-	virtual void updateServer(BOOL is_new) const;
+	virtual void updateParentOnServer(bool restamp) const;
+	virtual void updateServer(bool is_new) const;
 	void fetchFromServer(void) const;
 
 	virtual void packMessage(LLMessageSystem* msg) const;
-	virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
-	virtual BOOL unpackMessage(const LLSD& item);
+	virtual bool unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
+	virtual bool unpackMessage(const LLSD& item);
 	virtual bool importLegacyStream(std::istream& input_stream);
 
 	// new methods
@@ -197,8 +197,8 @@ public:
 	LLViewerInventoryCategory(const LLViewerInventoryCategory* other);
 	void copyViewerCategory(const LLViewerInventoryCategory* other);
 
-	virtual void updateParentOnServer(BOOL restamp_children) const;
-	virtual void updateServer(BOOL is_new) const;
+	virtual void updateParentOnServer(bool restamp_children) const;
+	virtual void updateServer(bool is_new) const;
 
 	virtual void packMessage(LLMessageSystem* msg) const;
 
@@ -236,7 +236,7 @@ public:
 	void determineFolderType();
 	void changeType(LLFolderType::EType new_folder_type);
 	virtual void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
-	virtual BOOL unpackMessage(const LLSD& category);
+	virtual bool unpackMessage(const LLSD& category);
     
     // returns true if the category object will accept the incoming item
     bool acceptItem(LLInventoryItem* inv_item);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ae365de6fc..3d2feb5b1f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8341,7 +8341,7 @@ void handle_grab_baked_texture(void* data)
 										LLInventoryItemFlags::II_FLAGS_NONE,
 										creation_date_now);
 
-		item->updateServer(TRUE);
+		item->updateServer(true);
 		gInventory.updateItem(item);
 		gInventory.notifyObservers();
 
@@ -8372,7 +8372,7 @@ BOOL enable_grab_baked_texture(void* data)
 	{
 		return gAgentAvatarp->canGrabBakedTexture(index);
 	}
-	return FALSE;
+	return false;
 }
 
 // Returns a pointer to the avatar give the UUID of the avatar OR of an attachment the avatar is wearing.
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ada898b98c..721f822f63 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5978,7 +5978,7 @@ void container_inventory_arrived(LLViewerObject* object,
                             LLSaleInfo::DEFAULT,
                             item->getFlags(),
                             creation_date_utc);
-                    new_item->updateServer(TRUE);
+                    new_item->updateServer(true);
                     gInventory.updateItem(new_item);
                 }
             }
@@ -6019,7 +6019,7 @@ void container_inventory_arrived(LLViewerObject* object,
 										LLSaleInfo::DEFAULT,
 										item->getFlags(),
 										creation_date_utc);
-		new_item->updateServer(TRUE);
+		new_item->updateServer(true);
 		gInventory.updateItem(new_item);
 		gInventory.notifyObservers();
 		if(active_panel)
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 696fe3536c..f0479f07b2 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -204,7 +204,7 @@ F32 LLControlGroup::getF32(const std::string& name) { return 0.0f; }
 U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only) { return 1; }
 void LLControlGroup::setString(const std::string& name, const std::string& val) {}
 std::string LLControlGroup::getString(const std::string& name) { return "test_string"; }
-LLControlVariable* LLControlGroup::declareBOOL(const std::string& name, BOOL initial_val, const std::string& comment, LLControlVariable::ePersist persist) { return NULL; }
+LLControlVariable* LLControlGroup::declareBOOL(const std::string& name, bool initial_val, const std::string& comment, LLControlVariable::ePersist persist) { return NULL; }
 LLControlVariable* LLControlGroup::declareString(const std::string& name, const std::string &initial_val, const std::string& comment, LLControlVariable::ePersist persist) { return NULL; }
 
 #include "lluicolortable.h"