Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/lltracker.h b/indra/newview/lltracker.h
index 4a6f10b767..1b5e5d8a73 100644
--- a/indra/newview/lltracker.h
+++ b/indra/newview/lltracker.h
@@ -88,7 +88,7 @@ public:
 	// returns global pos of tracked thing
 	static LLVector3d 	getTrackedPositionGlobal();
 
-	static BOOL 		hasLandmarkPosition();
+	static bool 		hasLandmarkPosition();
 	static const std::string& getTrackedLocationName();
 
 	static void drawHUDArrow();
@@ -96,10 +96,10 @@ public:
 	// Draw in-world 3D tracking stuff
 	static void	render3D();
 
-	static BOOL handleMouseDown(S32 x, S32 y);
+	static bool handleMouseDown(S32 x, S32 y);
 
 	static LLTracker* sTrackerp;
-	static BOOL sCheesyBeacon;
+	static bool sCheesyBeacon;
 	
 	static const std::string& getLabel() { return instance()->mLabel; }
 	static const std::string& getToolTip() { return instance()->mToolTip; }
@@ -141,13 +141,13 @@ protected:
 	LLUUID					mTrackedLandmarkItemID;
 	std::vector<LLUUID>	mLandmarkAssetIDList;
 	std::vector<LLUUID>	mLandmarkItemIDList;
-	BOOL					mHasReachedLandmark;
-	BOOL 					mHasLandmarkPosition;
-	BOOL					mLandmarkHasBeenVisited;
+	bool					mHasReachedLandmark;
+	bool 					mHasLandmarkPosition;
+	bool					mLandmarkHasBeenVisited;
 
 	std::string				mTrackedLocationName;
-	BOOL					mIsTrackingLocation;
-	BOOL					mHasReachedLocation;
+	bool					mIsTrackingLocation;
+	bool					mHasReachedLocation;
 };