Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge

Merge Maint A to development

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 03aede94c6..b33e3d6ea5 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -111,7 +111,7 @@ LLFloaterPathfindingLinksets::~LLFloaterPathfindingLinksets()
 {
 }
 
-BOOL LLFloaterPathfindingLinksets::postBuild()
+bool LLFloaterPathfindingLinksets::postBuild()
 {
 	mBeaconColor = LLUIColorTable::getInstance()->getColor("PathfindingLinksetBeaconColor");
 
@@ -577,12 +577,12 @@ void LLFloaterPathfindingLinksets::updateStateOnEditFields()
 
 void LLFloaterPathfindingLinksets::updateStateOnEditLinksetUse()
 {
-	BOOL useWalkable = FALSE;
-	BOOL useStaticObstacle = FALSE;
-	BOOL useDynamicObstacle = FALSE;
-	BOOL useMaterialVolume = FALSE;
-	BOOL useExclusionVolume = FALSE;
-	BOOL useDynamicPhantom = FALSE;
+	bool useWalkable = false;
+	bool useStaticObstacle = false;
+	bool useDynamicObstacle = false;
+	bool useMaterialVolume = false;
+	bool useExclusionVolume = false;
+	bool useDynamicPhantom = false;
 
 	LLPathfindingObjectListPtr selectedObjects = getSelectedObjects();
 	if ((selectedObjects != NULL) && !selectedObjects->isEmpty())