Replace remaining BOOL with bool llinventory and llmessage

8 files changed, 158 insertions, 159 deletions

diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index d2c3b419ab..c1d54bc210 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -84,47 +84,47 @@ protected:
 LLFolderDictionary::LLFolderDictionary()
 {
 	//       													    TYPE NAME, PROTECTED, AUTOMATIC, SINGLETON
-	addEntry(LLFolderType::FT_TEXTURE, 				new FolderEntry("texture",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_SOUND, 				new FolderEntry("sound",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_CALLINGCARD, 			new FolderEntry("callcard",	TRUE, TRUE, FALSE));
-	addEntry(LLFolderType::FT_LANDMARK, 			new FolderEntry("landmark",	TRUE, FALSE, FALSE));
-	addEntry(LLFolderType::FT_CLOTHING, 			new FolderEntry("clothing",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_OBJECT, 				new FolderEntry("object",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_NOTECARD, 			new FolderEntry("notecard",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_ROOT_INVENTORY, 		new FolderEntry("root_inv",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_LSL_TEXT, 			new FolderEntry("lsltext",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_BODYPART, 			new FolderEntry("bodypart",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_TRASH, 				new FolderEntry("trash",	TRUE, FALSE, TRUE));
-	addEntry(LLFolderType::FT_SNAPSHOT_CATEGORY, 	new FolderEntry("snapshot", TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_LOST_AND_FOUND, 		new FolderEntry("lstndfnd",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_ANIMATION, 			new FolderEntry("animatn",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_GESTURE, 				new FolderEntry("gesture",	TRUE, TRUE, TRUE));
-	addEntry(LLFolderType::FT_FAVORITE, 			new FolderEntry("favorite",	TRUE, FALSE, TRUE));
+	addEntry(LLFolderType::FT_TEXTURE, 				new FolderEntry("texture",	true, true, true));
+	addEntry(LLFolderType::FT_SOUND, 				new FolderEntry("sound",	true, true, true));
+	addEntry(LLFolderType::FT_CALLINGCARD, 			new FolderEntry("callcard",	true, true, false));
+	addEntry(LLFolderType::FT_LANDMARK, 			new FolderEntry("landmark",	true, false, false));
+	addEntry(LLFolderType::FT_CLOTHING, 			new FolderEntry("clothing",	true, true, true));
+	addEntry(LLFolderType::FT_OBJECT, 				new FolderEntry("object",	true, true, true));
+	addEntry(LLFolderType::FT_NOTECARD, 			new FolderEntry("notecard",	true, true, true));
+	addEntry(LLFolderType::FT_ROOT_INVENTORY, 		new FolderEntry("root_inv",	true, true, true));
+	addEntry(LLFolderType::FT_LSL_TEXT, 			new FolderEntry("lsltext",	true, true, true));
+	addEntry(LLFolderType::FT_BODYPART, 			new FolderEntry("bodypart",	true, true, true));
+	addEntry(LLFolderType::FT_TRASH, 				new FolderEntry("trash",	true, false, true));
+	addEntry(LLFolderType::FT_SNAPSHOT_CATEGORY, 	new FolderEntry("snapshot", true, true, true));
+	addEntry(LLFolderType::FT_LOST_AND_FOUND, 		new FolderEntry("lstndfnd",	true, true, true));
+	addEntry(LLFolderType::FT_ANIMATION, 			new FolderEntry("animatn",	true, true, true));
+	addEntry(LLFolderType::FT_GESTURE, 				new FolderEntry("gesture",	true, true, true));
+	addEntry(LLFolderType::FT_FAVORITE, 			new FolderEntry("favorite",	true, false, true));
 	
 	for (S32 ensemble_num = S32(LLFolderType::FT_ENSEMBLE_START); ensemble_num <= S32(LLFolderType::FT_ENSEMBLE_END); ensemble_num++)
 	{
-		addEntry(LLFolderType::EType(ensemble_num), new FolderEntry("ensemble", FALSE, FALSE, FALSE)); // Not used
+		addEntry(LLFolderType::EType(ensemble_num), new FolderEntry("ensemble", false, false, false)); // Not used
 	}
 
-	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new FolderEntry("current",	TRUE, FALSE, TRUE));
-	addEntry(LLFolderType::FT_OUTFIT, 				new FolderEntry("outfit",	FALSE, FALSE, FALSE));
-	addEntry(LLFolderType::FT_MY_OUTFITS, 			new FolderEntry("my_otfts",	TRUE, FALSE, TRUE));
+	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new FolderEntry("current",	true, false, true));
+	addEntry(LLFolderType::FT_OUTFIT, 				new FolderEntry("outfit",	false, false, false));
+	addEntry(LLFolderType::FT_MY_OUTFITS, 			new FolderEntry("my_otfts",	true, false, true));
 
-	addEntry(LLFolderType::FT_MESH, 				new FolderEntry("mesh",		TRUE, FALSE, FALSE)); // Not used?
+	addEntry(LLFolderType::FT_MESH, 				new FolderEntry("mesh",		true, false, false)); // Not used?
 
-	addEntry(LLFolderType::FT_INBOX, 				new FolderEntry("inbox",	TRUE, FALSE, TRUE));
-	addEntry(LLFolderType::FT_OUTBOX, 				new FolderEntry("outbox",	TRUE, FALSE, FALSE));
+	addEntry(LLFolderType::FT_INBOX, 				new FolderEntry("inbox",	true, false, true));
+	addEntry(LLFolderType::FT_OUTBOX, 				new FolderEntry("outbox",	true, false, false));
 	
-	addEntry(LLFolderType::FT_BASIC_ROOT,			new FolderEntry("basic_rt", TRUE, FALSE, FALSE)); 
+	addEntry(LLFolderType::FT_BASIC_ROOT,			new FolderEntry("basic_rt", true, false, false)); 
 
-	addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new FolderEntry("merchant", FALSE, FALSE, FALSE));
-	addEntry(LLFolderType::FT_MARKETPLACE_STOCK,    new FolderEntry("stock",    FALSE, FALSE, FALSE));
-	addEntry(LLFolderType::FT_MARKETPLACE_VERSION,  new FolderEntry("version",  FALSE, FALSE, FALSE));
+	addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new FolderEntry("merchant", false, false, false));
+	addEntry(LLFolderType::FT_MARKETPLACE_STOCK,    new FolderEntry("stock",    false, false, false));
+	addEntry(LLFolderType::FT_MARKETPLACE_VERSION,  new FolderEntry("version",  false, false, false));
 		 
-    addEntry(LLFolderType::FT_SETTINGS,             new FolderEntry("settings", TRUE, FALSE, TRUE));
-    addEntry(LLFolderType::FT_MATERIAL,             new FolderEntry("material", TRUE, FALSE, TRUE));
+    addEntry(LLFolderType::FT_SETTINGS,             new FolderEntry("settings", true, false, true));
+    addEntry(LLFolderType::FT_MATERIAL,             new FolderEntry("material", true, false, true));
 
-	addEntry(LLFolderType::FT_NONE, 				new FolderEntry("-1",		FALSE, FALSE, FALSE));
+	addEntry(LLFolderType::FT_NONE, 				new FolderEntry("-1",		false, false, false));
 };
 
 // static
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 695b04097f..a14b7258af 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -268,7 +268,7 @@ public:
 	//--------------------------------------------------------------------
 public:
 	virtual bool importLegacyStream(std::istream& input_stream);
-	virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = TRUE) const;
+	virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = true) const;
 
 	LLSD exportLLSD() const;
 	bool importLLSD(const LLSD& cat_data);
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 78dcf40ac6..598e28921d 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -119,7 +119,7 @@ LLParcel::ECategory category_ui_string_to_category(const std::string& s);
 
 LLParcel::LLParcel()
 {
-    init(LLUUID::null, TRUE, FALSE, FALSE, 0, 0, 0, 0, 0, 1.f, 0);
+    init(LLUUID::null, true, false, false, 0, 0, 0, 0, 0, 1.f, 0);
 }
 
 
@@ -191,13 +191,13 @@ void LLParcel::init(const LLUUID &owner_id,
 	setMediaType(LLStringUtil::null);
 	mMediaID.setNull();
 	mMediaAutoScale = 0;
-	mMediaLoop = TRUE;
+	mMediaLoop = 1;
 	mMediaWidth = 0;
 	mMediaHeight = 0;
 	setMediaCurrentURL(LLStringUtil::null);
-	mMediaAllowNavigate = TRUE;
+	mMediaAllowNavigate = 1;
 	mMediaURLTimeout = 0.0f;
-	mMediaPreventCameraZoom = FALSE;
+	mMediaPreventCameraZoom = 0;
 
 	mGroupID.setNull();
 
@@ -219,20 +219,20 @@ void LLParcel::init(const LLUUID &owner_id,
 	setSelectedPrimCount(0);
 	setTempPrimCount(0);
 	setCleanOtherTime(0);
-    setRegionPushOverride(FALSE);
-    setRegionDenyAnonymousOverride(FALSE);
-    setRegionDenyAgeUnverifiedOverride(FALSE);
+    setRegionPushOverride(false);
+    setRegionDenyAnonymousOverride(false);
+    setRegionDenyAgeUnverifiedOverride(false);
 	setParcelPrimBonus(parcel_object_bonus);
 
 	setPreviousOwnerID(LLUUID::null);
-	setPreviouslyGroupOwned(FALSE);
+	setPreviouslyGroupOwned(false);
 
-	setSeeAVs(TRUE);
-	setAllowGroupAVSounds(TRUE);
-	setAllowAnyAVSounds(TRUE);
-	setHaveNewParcelLimitData(FALSE);
+	setSeeAVs(true);
+	setAllowGroupAVSounds(true);
+	setAllowAnyAVSounds(true);
+	setHaveNewParcelLimitData(false);
 
-    setRegionAllowEnvironmentOverride(FALSE);
+    setRegionAllowEnvironmentOverride(false);
     setParcelEnvironmentVersion(INVALID_PARCEL_ENVIRONMENT_VERSION);
 
     setObscureMOAP(false);
@@ -949,7 +949,7 @@ const std::string& LLParcel::getActionString(LLParcel::EAction action)
 
 bool LLParcel::isSaleTimerExpired(const U64& time)
 {
-    if (mSaleTimerExpires.getStarted() == FALSE)
+    if (mSaleTimerExpires.getStarted() == false)
     {
         return false;
     }
@@ -1011,11 +1011,11 @@ void LLParcel::expireSale(
     mSaleTimerExpires.setTimerExpirySec(0.0);
     mSaleTimerExpires.stop();
     setPreviousOwnerID(LLUUID::null);
-    setPreviouslyGroupOwned(FALSE);
-    setSellWithObjects(FALSE);
+    setPreviouslyGroupOwned(false);
+    setSellWithObjects(false);
     type = TRANS_LAND_RELEASE;
     mStatus = OS_NONE;
-    flags = pack_transaction_flags(mGroupOwned, FALSE);
+    flags = pack_transaction_flags(mGroupOwned, false);
     mAuthBuyerID.setNull();
     from_id = mOwnerID;
     mOwnerID.setNull();
@@ -1037,7 +1037,7 @@ void LLParcel::completeSale(
 
 	// Purchased parcels are assumed to no longer be for sale.
 	// Otherwise someone can snipe the sale.
-	setForSale(FALSE);
+	setForSale(false);
 	setAuctionID(0);
 
 	// Turn off show directory, since it's a recurring fee that
@@ -1062,11 +1062,11 @@ void LLParcel::clearSale()
 		mStatus = OS_LEASED;
 	}
 	mAuthBuyerID.setNull();
-	setForSale(FALSE);
+	setForSale(false);
 	setAuctionID(0);
 	setPreviousOwnerID(LLUUID::null);
-	setPreviouslyGroupOwned(FALSE);
-	setSellWithObjects(FALSE);
+	setPreviouslyGroupOwned(false);
+	setSellWithObjects(false);
 }
 
 bool LLParcel::isPublic() const
@@ -1093,15 +1093,15 @@ void LLParcel::clearParcel()
 	setMediaID(LLUUID::null);
     setMediaDesc(LLStringUtil::null);
 	setMediaAutoScale(0);
-	setMediaLoop(TRUE);
+	setMediaLoop(1);
 	mMediaWidth = 0;
 	mMediaHeight = 0;
 	setMediaCurrentURL(LLStringUtil::null);
-	setMediaAllowNavigate(TRUE);
-	setMediaPreventCameraZoom(FALSE);
+	setMediaAllowNavigate(1);
+	setMediaPreventCameraZoom(0);
 	setMediaURLTimeout(0.0f);
 	setMusicURL(LLStringUtil::null);
-	setInEscrow(FALSE);
+	setInEscrow(false);
 	setAuthorizedBuyerID(LLUUID::null);
 	setCategory(C_NONE);
 	setSnapshotID(LLUUID::null);
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index e3c27e7d73..ba85f5cdef 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -277,7 +277,7 @@ public:
 	void setUserLocation(const LLVector3& pos)	{ mUserLocation = pos; }
 	void setUserLookAt(const LLVector3& rot)	{ mUserLookAt = rot; }
 	void setLandingType(const ELandingType type) { mLandingType = type; }
-	void setSeeAVs(BOOL see_avs)	{ mSeeAVs = see_avs;	}
+	void setSeeAVs(bool see_avs)	{ mSeeAVs = see_avs;	}
 	void setHaveNewParcelLimitData(bool have_new_parcel_data)		{ mHaveNewParcelLimitData = have_new_parcel_data;		}		// Remove this once hidden AV feature is fully available grid-wide
 
 	void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
@@ -288,24 +288,24 @@ public:
 	virtual void setArea(S32 area, S32 sim_object_limit);
 	void	setDiscountRate(F32 rate);
 
-	void	setAllowModify(BOOL b)	{ setParcelFlag(PF_CREATE_OBJECTS, b); }
-	void	setAllowGroupModify(BOOL b)	{ setParcelFlag(PF_CREATE_GROUP_OBJECTS, b); }
-	void	setAllowAllObjectEntry(BOOL b)	{ setParcelFlag(PF_ALLOW_ALL_OBJECT_ENTRY, b); }
-	void	setAllowGroupObjectEntry(BOOL b)	{ setParcelFlag(PF_ALLOW_GROUP_OBJECT_ENTRY, b); }
-	void	setAllowTerraform(BOOL b){setParcelFlag(PF_ALLOW_TERRAFORM, b); }
-	void	setAllowDamage(BOOL b)	{ setParcelFlag(PF_ALLOW_DAMAGE, b); }
-	void	setAllowFly(BOOL b)		{ setParcelFlag(PF_ALLOW_FLY, b); }
-	void	setAllowGroupScripts(BOOL b)	{ setParcelFlag(PF_ALLOW_GROUP_SCRIPTS, b); }
-	void	setAllowOtherScripts(BOOL b)	{ setParcelFlag(PF_ALLOW_OTHER_SCRIPTS, b); }
-	void	setAllowDeedToGroup(BOOL b) { setParcelFlag(PF_ALLOW_DEED_TO_GROUP, b); }
-	void    setContributeWithDeed(BOOL b) { setParcelFlag(PF_CONTRIBUTE_WITH_DEED, b); }
-	void	setForSale(BOOL b)		{ setParcelFlag(PF_FOR_SALE, b); }
-	void	setSoundOnly(BOOL b)	{ setParcelFlag(PF_SOUND_LOCAL, b); }
-	void	setDenyAnonymous(BOOL b) { setParcelFlag(PF_DENY_ANONYMOUS, b); }
-	void	setDenyAgeUnverified(BOOL b) { setParcelFlag(PF_DENY_AGEUNVERIFIED, b); }
-	void	setRestrictPushObject(BOOL b) { setParcelFlag(PF_RESTRICT_PUSHOBJECT, b); }
-	void	setAllowGroupAVSounds(BOOL b)	{ mAllowGroupAVSounds = b;		}
-	void	setAllowAnyAVSounds(BOOL b)		{ mAllowAnyAVSounds = b;		}
+	void	setAllowModify(bool b)	{ setParcelFlag(PF_CREATE_OBJECTS, b); }
+	void	setAllowGroupModify(bool b)	{ setParcelFlag(PF_CREATE_GROUP_OBJECTS, b); }
+	void	setAllowAllObjectEntry(bool b)	{ setParcelFlag(PF_ALLOW_ALL_OBJECT_ENTRY, b); }
+	void	setAllowGroupObjectEntry(bool b)	{ setParcelFlag(PF_ALLOW_GROUP_OBJECT_ENTRY, b); }
+	void	setAllowTerraform(bool b){setParcelFlag(PF_ALLOW_TERRAFORM, b); }
+	void	setAllowDamage(bool b)	{ setParcelFlag(PF_ALLOW_DAMAGE, b); }
+	void	setAllowFly(bool b)		{ setParcelFlag(PF_ALLOW_FLY, b); }
+	void	setAllowGroupScripts(bool b)	{ setParcelFlag(PF_ALLOW_GROUP_SCRIPTS, b); }
+	void	setAllowOtherScripts(bool b)	{ setParcelFlag(PF_ALLOW_OTHER_SCRIPTS, b); }
+	void	setAllowDeedToGroup(bool b) { setParcelFlag(PF_ALLOW_DEED_TO_GROUP, b); }
+	void    setContributeWithDeed(bool b) { setParcelFlag(PF_CONTRIBUTE_WITH_DEED, b); }
+	void	setForSale(bool b)		{ setParcelFlag(PF_FOR_SALE, b); }
+	void	setSoundOnly(bool b)	{ setParcelFlag(PF_SOUND_LOCAL, b); }
+	void	setDenyAnonymous(bool b) { setParcelFlag(PF_DENY_ANONYMOUS, b); }
+	void	setDenyAgeUnverified(bool b) { setParcelFlag(PF_DENY_AGEUNVERIFIED, b); }
+	void	setRestrictPushObject(bool b) { setParcelFlag(PF_RESTRICT_PUSHOBJECT, b); }
+	void	setAllowGroupAVSounds(bool b)	{ mAllowGroupAVSounds = b;		}
+	void	setAllowAnyAVSounds(bool b)		{ mAllowAnyAVSounds = b;		}
     void    setObscureMOAP(bool b)  { mObscureMOAP = b; }
 
 	void	setDrawDistance(F32 dist)	{ mDrawDistance = dist; }
@@ -315,9 +315,9 @@ public:
 	void	setPassPrice(S32 price)				{ mPassPrice = price; }
 	void	setPassHours(F32 hours)				{ mPassHours = hours; }
 
-//	BOOL	importStream(std::istream& input_stream);
+//	bool	importStream(std::istream& input_stream);
 	bool	importAccessEntry(std::istream& input_stream, LLAccessEntry* entry);
-	// BOOL	exportStream(std::ostream& output_stream);
+	// bool	exportStream(std::ostream& output_stream);
 
 	void	packMessage(LLMessageSystem* msg);
 	void	packMessage(LLSD& msg);
@@ -372,7 +372,7 @@ public:
 	const LLUUID&	getGroupID() const			{ return mGroupID; }
 	S32				getPassPrice() const		{ return mPassPrice; }
 	F32				getPassHours() const		{ return mPassHours; }
-	BOOL			getIsGroupOwned() const		{ return mGroupOwned; }
+	bool			getIsGroupOwned() const		{ return mGroupOwned; }
 
 	U32 getAuctionID() const	{ return mAuctionID; }
 	bool isInEscrow() const		{ return mInEscrow; }
@@ -462,62 +462,62 @@ public:
 					{ return (mParcelFlags & PF_ALLOW_DEED_TO_GROUP) ? true : false; }
 
 	// Does the owner want to make a contribution along with the deed.
-	BOOL getContributeWithDeed() const
-	{ return (mParcelFlags & PF_CONTRIBUTE_WITH_DEED) ? TRUE : FALSE; }
+	bool getContributeWithDeed() const
+	{ return (mParcelFlags & PF_CONTRIBUTE_WITH_DEED) ? true : false; }
 
 	// heightfield can be modified
-	BOOL	getAllowTerraform() const
-					{ return (mParcelFlags & PF_ALLOW_TERRAFORM) ? TRUE : FALSE; }
+	bool	getAllowTerraform() const
+					{ return (mParcelFlags & PF_ALLOW_TERRAFORM) ? true : false; }
 
 	// avatars can be hurt here
-	BOOL	getAllowDamage() const
-					{ return (mParcelFlags & PF_ALLOW_DAMAGE) ? TRUE : FALSE; }
-
-	BOOL	getAllowFly() const
-					{ return (mParcelFlags & PF_ALLOW_FLY) ? TRUE : FALSE; }
-
-	BOOL	getAllowGroupScripts() const
-					{ return (mParcelFlags & PF_ALLOW_GROUP_SCRIPTS) ? TRUE : FALSE; }
-
-	BOOL	getAllowOtherScripts() const
-					{ return (mParcelFlags & PF_ALLOW_OTHER_SCRIPTS) ? TRUE : FALSE; }
-
-	BOOL	getAllowAllObjectEntry() const
-					{ return (mParcelFlags & PF_ALLOW_ALL_OBJECT_ENTRY) ? TRUE : FALSE; }
-
-	BOOL	getAllowGroupObjectEntry() const
-					{ return (mParcelFlags & PF_ALLOW_GROUP_OBJECT_ENTRY) ? TRUE : FALSE; }
-
-	BOOL	getForSale() const
-					{ return (mParcelFlags & PF_FOR_SALE) ? TRUE : FALSE; }
-	BOOL	getSoundLocal() const
-					{ return (mParcelFlags & PF_SOUND_LOCAL) ? TRUE : FALSE; }
-	BOOL	getParcelFlagAllowVoice() const
-					{ return (mParcelFlags & PF_ALLOW_VOICE_CHAT) ? TRUE : FALSE; }
-	BOOL	getParcelFlagUseEstateVoiceChannel() const
-					{ return (mParcelFlags & PF_USE_ESTATE_VOICE_CHAN) ? TRUE : FALSE; }
-	BOOL	getAllowPublish() const
-					{ return (mParcelFlags & PF_ALLOW_PUBLISH) ? TRUE : FALSE; }
-	BOOL	getMaturePublish() const
-					{ return (mParcelFlags & PF_MATURE_PUBLISH) ? TRUE : FALSE; }
-	BOOL	getRestrictPushObject() const
-					{ return (mParcelFlags & PF_RESTRICT_PUSHOBJECT) ? TRUE : FALSE; }
-	BOOL	getRegionPushOverride() const
+	bool	getAllowDamage() const
+					{ return (mParcelFlags & PF_ALLOW_DAMAGE) ? true : false; }
+
+	bool	getAllowFly() const
+					{ return (mParcelFlags & PF_ALLOW_FLY) ? true : false; }
+
+	bool	getAllowGroupScripts() const
+					{ return (mParcelFlags & PF_ALLOW_GROUP_SCRIPTS) ? true : false; }
+
+	bool	getAllowOtherScripts() const
+					{ return (mParcelFlags & PF_ALLOW_OTHER_SCRIPTS) ? true : false; }
+
+	bool	getAllowAllObjectEntry() const
+					{ return (mParcelFlags & PF_ALLOW_ALL_OBJECT_ENTRY) ? true : false; }
+
+	bool	getAllowGroupObjectEntry() const
+					{ return (mParcelFlags & PF_ALLOW_GROUP_OBJECT_ENTRY) ? true : false; }
+
+	bool	getForSale() const
+					{ return (mParcelFlags & PF_FOR_SALE) ? true : false; }
+	bool	getSoundLocal() const
+					{ return (mParcelFlags & PF_SOUND_LOCAL) ? true : false; }
+	bool	getParcelFlagAllowVoice() const
+					{ return (mParcelFlags & PF_ALLOW_VOICE_CHAT) ? true : false; }
+	bool	getParcelFlagUseEstateVoiceChannel() const
+					{ return (mParcelFlags & PF_USE_ESTATE_VOICE_CHAN) ? true : false; }
+	bool	getAllowPublish() const
+					{ return (mParcelFlags & PF_ALLOW_PUBLISH) ? true : false; }
+	bool	getMaturePublish() const
+					{ return (mParcelFlags & PF_MATURE_PUBLISH) ? true : false; }
+	bool	getRestrictPushObject() const
+					{ return (mParcelFlags & PF_RESTRICT_PUSHOBJECT) ? true : false; }
+	bool	getRegionPushOverride() const
 					{ return mRegionPushOverride; }
-	BOOL	getRegionDenyAnonymousOverride() const
+	bool	getRegionDenyAnonymousOverride() const
 					{ return mRegionDenyAnonymousOverride; }
-	BOOL	getRegionDenyAgeUnverifiedOverride() const
+	bool	getRegionDenyAgeUnverifiedOverride() const
 					{ return mRegionDenyAgeUnverifiedOverride; }
-    BOOL    getRegionAllowAccessOverride() const
+    bool    getRegionAllowAccessOverride() const
                     { return mRegionAllowAccessoverride; }
-    BOOL    getRegionAllowEnvironmentOverride() const
+    bool    getRegionAllowEnvironmentOverride() const
                     { return mRegionAllowEnvironmentOverride; }
     S32     getParcelEnvironmentVersion() const 
                     { return mCurrentEnvironmentVersion; }
 
 
-	BOOL	getAllowGroupAVSounds()	const	{ return mAllowGroupAVSounds;	} 
-	BOOL	getAllowAnyAVSounds()	const	{ return mAllowAnyAVSounds;		}
+	bool	getAllowGroupAVSounds()	const	{ return mAllowGroupAVSounds;	}
+	bool	getAllowAnyAVSounds()	const	{ return mAllowAnyAVSounds;		}
  
     bool    getObscureMOAP() const { return mObscureMOAP; }
 
@@ -582,30 +582,30 @@ public:
 	void	setParcelPrimBonus(F32 bonus) 	{ mParcelPrimBonus = bonus; }
 
 	void	setCleanOtherTime(S32 time)					{ mCleanOtherTime = time; }
-	void	setRegionPushOverride(BOOL override) {mRegionPushOverride = override; }
-	void	setRegionDenyAnonymousOverride(BOOL override)	{ mRegionDenyAnonymousOverride = override; }
-	void	setRegionDenyAgeUnverifiedOverride(BOOL override)	{ mRegionDenyAgeUnverifiedOverride = override; }
-    void    setRegionAllowAccessOverride(BOOL override) { mRegionAllowAccessoverride = override; }
-    void    setRegionAllowEnvironmentOverride(BOOL override) { mRegionAllowEnvironmentOverride = override; }
+	void	setRegionPushOverride(bool override) {mRegionPushOverride = override; }
+	void	setRegionDenyAnonymousOverride(bool override)	{ mRegionDenyAnonymousOverride = override; }
+	void	setRegionDenyAgeUnverifiedOverride(bool override)	{ mRegionDenyAgeUnverifiedOverride = override; }
+    void    setRegionAllowAccessOverride(bool override) { mRegionAllowAccessoverride = override; }
+    void    setRegionAllowEnvironmentOverride(bool override) { mRegionAllowEnvironmentOverride = override; }
 
     void    setParcelEnvironmentVersion(S32 version) { mCurrentEnvironmentVersion = version; }
 
 	// Accessors for parcel sellWithObjects
 	void	setPreviousOwnerID(LLUUID prev_owner)	{ mPreviousOwnerID = prev_owner; }
-	void	setPreviouslyGroupOwned(BOOL b)			{ mPreviouslyGroupOwned = b; }
-	void	setSellWithObjects(BOOL b)				{ setParcelFlag(PF_SELL_PARCEL_OBJECTS, b); }
+	void	setPreviouslyGroupOwned(bool b)			{ mPreviouslyGroupOwned = b; }
+	void	setSellWithObjects(bool b)				{ setParcelFlag(PF_SELL_PARCEL_OBJECTS, b); }
 
 	LLUUID	getPreviousOwnerID() const		{ return mPreviousOwnerID; }
-	BOOL	getPreviouslyGroupOwned() const	{ return mPreviouslyGroupOwned; }
-	BOOL	getSellWithObjects() const		{ return (mParcelFlags & PF_SELL_PARCEL_OBJECTS) ? TRUE : FALSE; }
+	bool	getPreviouslyGroupOwned() const	{ return mPreviouslyGroupOwned; }
+	bool	getSellWithObjects() const		{ return (mParcelFlags & PF_SELL_PARCEL_OBJECTS) ? true : false; }
 
 protected:
 	LLUUID mID;
 	LLUUID				mOwnerID;
 	LLUUID				mGroupID;
-	BOOL				mGroupOwned; // TRUE if mOwnerID is a group_id
+	bool				mGroupOwned; // true if mOwnerID is a group_id
 	LLUUID				mPreviousOwnerID;
-	BOOL				mPreviouslyGroupOwned;
+	bool				mPreviouslyGroupOwned;
 
 	EOwnershipStatus mStatus;
 	ECategory mCategory;
@@ -614,8 +614,8 @@ protected:
 	LLVector3 mUserLocation;
 	LLVector3 mUserLookAt;
 	ELandingType mLandingType;
-	BOOL mSeeAVs;							// Avatars on this parcel are visible from outside it
-	BOOL mHaveNewParcelLimitData;			// Remove once hidden AV feature is grid-wide
+	bool mSeeAVs;							// Avatars on this parcel are visible from outside it
+	bool mHaveNewParcelLimitData;			// Remove once hidden AV feature is grid-wide
 	LLTimer mSaleTimerExpires;
 	LLTimer mMediaResetTimer;
 
@@ -666,13 +666,13 @@ protected:
 	S32					mTempPrimCount;
 	F32					mParcelPrimBonus;
 	S32					mCleanOtherTime;
-	BOOL				mRegionPushOverride;
-	BOOL				mRegionDenyAnonymousOverride;
-	BOOL				mRegionDenyAgeUnverifiedOverride;
-    BOOL                mRegionAllowAccessoverride;
-    BOOL                mRegionAllowEnvironmentOverride;
-	BOOL				mAllowGroupAVSounds;
-	BOOL				mAllowAnyAVSounds;
+	bool				mRegionPushOverride;
+	bool				mRegionDenyAnonymousOverride;
+	bool				mRegionDenyAgeUnverifiedOverride;
+    bool                mRegionAllowAccessoverride;
+    bool                mRegionAllowEnvironmentOverride;
+	bool				mAllowGroupAVSounds;
+	bool				mAllowAnyAVSounds;
     bool                mObscureMOAP;
     S32                 mCurrentEnvironmentVersion;
 	
@@ -692,13 +692,11 @@ public:
 
 	void setExperienceKeyType(const LLUUID& experience_key, U32 type);
 	U32 countExperienceKeyType(U32 type);
-	U32 getExperienceKeyType(const LLUUID& experience_key)const;
 	LLAccessEntry::map getExperienceKeysByType(U32 type)const;
 	void clearExperienceKeysByType(U32 type);
 
 private:
 	xp_type_map_t mExperienceKeys;
-
 };
 
 
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index a8acef098a..da3d3244db 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -285,20 +285,20 @@ public:
 	// They also return true if the object isn't owned, or the
 	// requesting agent is a system agent.  See llpermissionsflags.h
 	// for bits.
-	//BOOL	allowDeleteBy(const LLUUID& agent_id) 	const		{ return allowModifyBy(agent_id); }
-	//BOOL	allowEditBy(const LLUUID& agent_id) 	const		{ return allowModifyBy(agent_id); }
+	//bool	allowDeleteBy(const LLUUID& agent_id) 	const		{ return allowModifyBy(agent_id); }
+	//bool	allowEditBy(const LLUUID& agent_id) 	const		{ return allowModifyBy(agent_id); }
 	// saves last owner and sets current owner
-	//BOOL setOwner(const LLUUID& agent, const LLUUID& owner);	
+	//bool setOwner(const LLUUID& agent, const LLUUID& owner);	
 	// This method saves the last owner, sets the current owner to the
 	// one provided, and sets the base mask as indicated.
-	//BOOL setOwner(const LLUUID& agent, const LLUUID& owner, U32 new_base_mask);
+	//bool setOwner(const LLUUID& agent, const LLUUID& owner, U32 new_base_mask);
 
 	// Attempt to set or clear the given bitmask.  Returns TRUE if you
 	// are allowed to modify the permissions.  If you attempt to turn
 	// on bits not allowed by the base bits, the function will return
 	// TRUE, but those bits will not be set.
-	//BOOL setGroupBits( const LLUUID& agent, BOOL set, PermissionMask bits);
-	//BOOL setEveryoneBits(const LLUUID& agent, BOOL set, PermissionMask bits);
+	//bool setGroupBits( const LLUUID& agent, bool set, PermissionMask bits);
+	//bool setEveryoneBits(const LLUUID& agent, bool set, PermissionMask bits);
 
 	//
 	// MISC METHODS and OPERATORS
@@ -361,7 +361,7 @@ bool LLPermissions::allowTransferTo(const LLUUID &agent_id) const
 	}
 	else
 	{
-		return ((mOwner == agent_id) ? TRUE : allowOperationBy(PERM_TRANSFER, mOwner));
+		return ((mOwner == agent_id) ? true : allowOperationBy(PERM_TRANSFER, mOwner));
 	}
 }
 
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp
index 4ab22d4002..7bce5fd0cb 100644
--- a/indra/llinventory/llsaleinfo.cpp
+++ b/indra/llinventory/llsaleinfo.cpp
@@ -163,7 +163,7 @@ bool LLSaleInfo::importLegacyStream(std::istream& input_stream, bool& has_perm_m
 		else if (!strcmp("perm_mask", keyword))
 		{
 			//LL_INFOS() << "found deprecated keyword perm_mask" << LL_ENDL;
-			has_perm_mask = TRUE;
+			has_perm_mask = true;
 			sscanf(valuestr, "%x", &perm_mask);
 		}
 		else
diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp
index e21f29df41..72e0d83d2a 100644
--- a/indra/llinventory/lltransactionflags.cpp
+++ b/indra/llinventory/lltransactionflags.cpp
@@ -38,7 +38,7 @@ const U8 TRANSACTION_FLAG_OWNER_GROUP = 4;
 const U8 TRANSACTION_FLAG_SIMULTANEOUS_CONTRIBUTION = 8;
 const U8 TRANSACTION_FLAG_SIMULTANEOUS_CONTRIBUTION_REMOVAL = 16;
 
-U8 pack_transaction_flags(BOOL is_source_group, BOOL is_dest_group)
+U8 pack_transaction_flags(bool is_source_group, bool is_dest_group)
 {
 	U8 rv = 0;
 	if(is_source_group) rv |= TRANSACTION_FLAG_SOURCE_GROUP;
@@ -46,17 +46,17 @@ U8 pack_transaction_flags(BOOL is_source_group, BOOL is_dest_group)
 	return rv;
 }
 
-BOOL is_tf_source_group(TransactionFlags flags)
+bool is_tf_source_group(TransactionFlags flags)
 {
 	return ((flags & TRANSACTION_FLAG_SOURCE_GROUP) == TRANSACTION_FLAG_SOURCE_GROUP);
 }
 
-BOOL is_tf_dest_group(TransactionFlags flags)
+bool is_tf_dest_group(TransactionFlags flags)
 {
 	return ((flags & TRANSACTION_FLAG_DEST_GROUP) == TRANSACTION_FLAG_DEST_GROUP);
 }
 
-BOOL is_tf_owner_group(TransactionFlags flags)
+bool is_tf_owner_group(TransactionFlags flags)
 {
 	return ((flags & TRANSACTION_FLAG_OWNER_GROUP) == TRANSACTION_FLAG_OWNER_GROUP);
 }
@@ -79,6 +79,7 @@ void append_reason(
 		break;
 	case TRANS_GROUP_LAND_DEED:
 		ostr << " for deeding land";
+		break;
 	default:
 		break;
 	}
diff --git a/indra/llinventory/lltransactionflags.h b/indra/llinventory/lltransactionflags.h
index 8227f3bcc2..ca426035b4 100644
--- a/indra/llinventory/lltransactionflags.h
+++ b/indra/llinventory/lltransactionflags.h
@@ -39,10 +39,10 @@ extern const TransactionFlags TRANSACTION_FLAG_SIMULTANEOUS_CONTRIBUTION;
 extern const TransactionFlags TRANSACTION_FLAG_SIMULTANEOUS_CONTRIBUTION_REMOVAL;
 
 // very simple helper functions
-TransactionFlags pack_transaction_flags(BOOL is_source_group, BOOL is_dest_group);
-BOOL is_tf_source_group(TransactionFlags flags);
-BOOL is_tf_dest_group(TransactionFlags flags);
-BOOL is_tf_owner_group(TransactionFlags flags);
+TransactionFlags pack_transaction_flags(bool is_source_group, bool is_dest_group);
+bool is_tf_source_group(TransactionFlags flags);
+bool is_tf_dest_group(TransactionFlags flags);
+bool is_tf_owner_group(TransactionFlags flags);
 
 // stupid helper functions which should be replaced with some kind of
 // internationalizeable message.