Convert remaining BOOL to bool

1 files changed, 64 insertions, 64 deletions

diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 839a1e9724..2097d525d3 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -91,12 +91,12 @@ public:
 	LLPickInfo();
 	LLPickInfo(const LLCoordGL& mouse_pos, 
 		MASK keyboard_mask, 
-		BOOL pick_transparent,
-		BOOL pick_rigged,
-		BOOL pick_particle,
-        BOOL pick_reflection_probe,
-		BOOL pick_surface_info,
-		BOOL pick_unselectable,
+		bool pick_transparent,
+		bool pick_rigged,
+		bool pick_particle,
+        bool pick_reflection_probe,
+		bool pick_surface_info,
+		bool pick_unselectable,
 		void (*pick_callback)(const LLPickInfo& pick_info));
 
 	void fetchResults();
@@ -127,17 +127,17 @@ public:
 	LLVector3		mNormal;
 	LLVector4		mTangent;
 	LLVector3		mBinormal;
-	BOOL			mPickTransparent;
-	BOOL			mPickRigged;
-	BOOL			mPickParticle;
-	BOOL			mPickUnselectable;
-    BOOL            mPickReflectionProbe = FALSE;
+	bool			mPickTransparent;
+	bool			mPickRigged;
+	bool			mPickParticle;
+	bool			mPickUnselectable;
+    bool            mPickReflectionProbe = false;
 	void		    getSurfaceInfo();
 
 private:
 	void			updateXYCoords();
 
-	BOOL			mWantSurfaceInfo;   // do we populate mUVCoord, mNormal, mBinormal?
+	bool			mWantSurfaceInfo;   // do we populate mUVCoord, mNormal, mBinormal?
 
 };
 
@@ -184,7 +184,7 @@ public:
     void            reshapeStatusBarContainer();
     void            resetStatusBarContainer(); // undo changes done by resetStatusBarContainer on initWorldUI()
 
-	BOOL handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down, bool &is_toolmgr_action);
+	bool handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, bool down, bool &is_toolmgr_action);
 
 	//
 	// LLWindowCallback interface implementation
@@ -203,7 +203,7 @@ public:
 	/*virtual*/ bool handleMiddleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
 	/*virtual*/ bool handleOtherMouseDown(LLWindow *window, LLCoordGL pos, MASK mask, S32 button);
 	/*virtual*/ bool handleOtherMouseUp(LLWindow *window, LLCoordGL pos, MASK mask, S32 button);
-	BOOL handleOtherMouse(LLWindow *window, LLCoordGL pos, MASK mask, S32 button, bool down);
+	bool handleOtherMouse(LLWindow *window, LLCoordGL pos, MASK mask, S32 button, bool down);
 	/*virtual*/ LLWindowCallbacks::DragNDropResult handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, LLWindowCallbacks::DragNDropAction action, std::string data);
 				void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask);
                 void handleMouseDragged(LLWindow *window,  LLCoordGL pos, MASK mask);
@@ -279,9 +279,9 @@ public:
 	S32				getCurrentMouseDY()		const	{ return mCurrentMouseDelta.mY; }
 	LLCoordGL		getCurrentMouseDelta()	const	{ return mCurrentMouseDelta; }
 	static LLTrace::SampleStatHandle<>*	getMouseVelocityStat()		{ return &sMouseVelocityStat; }
-	BOOL			getLeftMouseDown()	const	{ return mLeftMouseDown; }
-	BOOL			getMiddleMouseDown()	const	{ return mMiddleMouseDown; }
-	BOOL			getRightMouseDown()	const	{ return mRightMouseDown; }
+	bool			getLeftMouseDown()	const	{ return mLeftMouseDown; }
+	bool			getMiddleMouseDown()	const	{ return mMiddleMouseDown; }
+	bool			getRightMouseDown()	const	{ return mRightMouseDown; }
 
 	const LLPickInfo&	getLastPick() const { return mLastPick; }
 
@@ -296,7 +296,7 @@ public:
 		
 
 	// Is window of our application frontmost?
-	BOOL			getActive() const			{ return mActive; }
+	bool			getActive() const			{ return mActive; }
 
 	const std::string&	getInitAlert() { return mInitAlert; }
 	
@@ -308,16 +308,16 @@ public:
 	void			setCursor( ECursorType c );
 	void			showCursor();
 	void			hideCursor();
-	BOOL            getCursorHidden() { return mCursorHidden; }
+	bool            getCursorHidden() { return mCursorHidden; }
 	void			moveCursorToCenter();								// move to center of window
 													
 	void			initTextures(S32 location_id);
-	void			setShowProgress(const BOOL show);
-	BOOL			getShowProgress() const;
+	void			setShowProgress(const bool show);
+	bool			getShowProgress() const;
 	void			setProgressString(const std::string& string);
 	void			setProgressPercent(const F32 percent);
 	void			setProgressMessage(const std::string& msg);
-	void			setProgressCancelButtonVisible( BOOL b, const std::string& label = LLStringUtil::null );
+	void			setProgressCancelButtonVisible( bool b, const std::string& label = LLStringUtil::null );
 	LLProgressView *getProgressView() const;
 	void			revealIntroPanel();
 	void			setStartupComplete();
@@ -333,8 +333,8 @@ public:
 	LLView*			getToolBarHolder() { return mToolBarHolder.get(); }
 	LLView*			getHintHolder() { return mHintHolder.get(); }
 	LLView*			getLoginPanelHolder() { return mLoginPanelHolder.get(); }
-	BOOL			handleKey(KEY key, MASK mask);
-	BOOL			handleKeyUp(KEY key, MASK mask);
+	bool			handleKey(KEY key, MASK mask);
+	bool			handleKeyUp(KEY key, MASK mask);
 	void			handleScrollWheel	(S32 clicks);
 	void			handleScrollHWheel	(S32 clicks);
 
@@ -344,7 +344,7 @@ public:
 	void			clearPopups();
 
 	// Hide normal UI when a logon fails, re-show everything when logon is attempted again
-	void			setNormalControlsVisible( BOOL visible );
+	void			setNormalControlsVisible( bool visible );
 	void			setMenuBackgroundColor(bool god_mode = false, bool dev_grid = false);
 
 	void			reshape(S32 width, S32 height);
@@ -361,11 +361,11 @@ public:
 	// snapshot functionality.
 	// perhaps some of this should move to llfloatershapshot?  -MG
 
-	BOOL			saveSnapshot(const std::string&  filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL show_hud = TRUE, BOOL do_rebuild = FALSE, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::ESnapshotFormat format = LLSnapshotModel::SNAPSHOT_FORMAT_BMP);
-	BOOL			rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, BOOL is_texture = FALSE,
-		BOOL show_ui = TRUE, BOOL show_hud = TRUE, BOOL do_rebuild = FALSE, BOOL no_post = FALSE, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_SNAPSHOT_IMAGE_SIZE);
+	bool			saveSnapshot(const std::string&  filename, S32 image_width, S32 image_height, bool show_ui = true, bool show_hud = true, bool do_rebuild = false, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::ESnapshotFormat format = LLSnapshotModel::SNAPSHOT_FORMAT_BMP);
+	bool			rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, bool keep_window_aspect = true, bool is_texture = false,
+		bool show_ui = true, bool show_hud = true, bool do_rebuild = false, bool no_post = false, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_SNAPSHOT_IMAGE_SIZE);
 
-    BOOL			simpleSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, const int num_render_passes);
+    bool			simpleSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, const int num_render_passes);
 
     
     
@@ -375,19 +375,19 @@ public:
     // index - cube index in the array to use (cube index, not face-layer)
     // face - which cube face to update
     // near_clip - near clip setting to use
-    BOOL cubeSnapshot(const LLVector3& origin, LLCubeMapArray* cubearray, S32 index, S32 face, F32 near_clip, bool render_avatars);
+    bool cubeSnapshot(const LLVector3& origin, LLCubeMapArray* cubearray, S32 index, S32 face, F32 near_clip, bool render_avatars);
 
     
     // special implementation of simpleSnapshot for reflection maps
-    BOOL			reflectionSnapshot(LLImageRaw* raw, S32 image_width, S32 image_height, const int num_render_passes);
+    bool			reflectionSnapshot(LLImageRaw* raw, S32 image_width, S32 image_height, const int num_render_passes);
 
-    BOOL			thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL show_hud, BOOL do_rebuild, BOOL no_post, LLSnapshotModel::ESnapshotLayerType type);
-	BOOL			isSnapshotLocSet() const;
+    bool			thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, bool show_ui, bool show_hud, bool do_rebuild, bool no_post, LLSnapshotModel::ESnapshotLayerType type);
+	bool			isSnapshotLocSet() const;
 	void			resetSnapshotLoc() const;
 
 	typedef boost::signals2::signal<void(void)> snapshot_saved_signal_t;
 
-	void			saveImageNumbered(LLImageFormatted *image, BOOL force_picker, const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb);
+	void			saveImageNumbered(LLImageFormatted *image, bool force_picker, const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb);
 	void			onDirectorySelected(const std::vector<std::string>& filenames, LLImageFormatted *image, const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb);
 	void			saveImageLocal(LLImageFormatted *image, const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb);
 	void			onSelectionFailure(const snapshot_saved_signal_t::slot_type& failure_cb);
@@ -399,7 +399,7 @@ public:
 	void			playSnapshotAnimAndSound();
 	
 	// draws selection boxes around selected objects, must call displayObjects first
-	void			renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, BOOL for_hud );
+	void			renderSelections( bool for_gl_pick, bool pick_parcel_walls, bool for_hud );
 	void			performPick();
 	void			returnEmptyPicks();
 
@@ -407,21 +407,21 @@ public:
 								S32 y_from_bot,
 								MASK mask,
 								void (*callback)(const LLPickInfo& pick_info),
-								BOOL pick_transparent = FALSE,
-								BOOL pick_rigged = FALSE,
-								BOOL pick_unselectable = FALSE,
-                                BOOL pick_reflection_probes = FALSE);
-	LLPickInfo		pickImmediate(S32 x, S32 y, BOOL pick_transparent, BOOL pick_rigged = FALSE, BOOL pick_particle = FALSE, BOOL pick_unselectable = TRUE, BOOL pick_reflection_probe = FALSE);
+								bool pick_transparent = false,
+								bool pick_rigged = false,
+								bool pick_unselectable = false,
+                                bool pick_reflection_probes = false);
+	LLPickInfo		pickImmediate(S32 x, S32 y, bool pick_transparent, bool pick_rigged = false, bool pick_particle = false, bool pick_unselectable = true, bool pick_reflection_probe = false);
 	LLHUDIcon* cursorIntersectIcon(S32 mouse_x, S32 mouse_y, F32 depth,
 										   LLVector4a* intersection);
 
 	LLViewerObject* cursorIntersect(S32 mouse_x = -1, S32 mouse_y = -1, F32 depth = 512.f,
 									LLViewerObject *this_object = NULL,
 									S32 this_face = -1,
-									BOOL pick_transparent = FALSE,
-									BOOL pick_rigged = FALSE,
-                                    BOOL pick_unselectable = TRUE,
-                                    BOOL pick_reflection_probe = TRUE,
+									bool pick_transparent = false,
+									bool pick_rigged = false,
+                                    bool pick_unselectable = true,
+                                    bool pick_reflection_probe = true,
 									S32* face_hit = NULL,
 									LLVector4a *intersection = NULL,
 									LLVector2 *uv = NULL,
@@ -439,10 +439,10 @@ public:
 	//const LLVector3d& lastNonFloraObjectHitOffset();
 
 	// mousePointOnLand() returns true if found point
-	BOOL			mousePointOnLandGlobal(const S32 x, const S32 y, LLVector3d *land_pos_global, BOOL ignore_distance = FALSE);
-	BOOL			mousePointOnPlaneGlobal(LLVector3d& point, const S32 x, const S32 y, const LLVector3d &plane_point, const LLVector3 &plane_normal);
+	bool			mousePointOnLandGlobal(const S32 x, const S32 y, LLVector3d *land_pos_global, bool ignore_distance = false);
+	bool			mousePointOnPlaneGlobal(LLVector3d& point, const S32 x, const S32 y, const LLVector3d &plane_point, const LLVector3 &plane_normal);
 	LLVector3d		clickPointInWorldGlobal(const S32 x, const S32 y_from_bot, LLViewerObject* clicked_object) const;
-	BOOL			clickPointOnSurfaceGlobal(const S32 x, const S32 y, LLViewerObject *objectp, LLVector3d &point_global) const;
+	bool			clickPointOnSurfaceGlobal(const S32 x, const S32 y, LLViewerObject *objectp, LLVector3d &point_global) const;
 
 	// Prints window implementation details
 	void			dumpState();
@@ -450,9 +450,9 @@ public:
 	// handle shutting down GL and bringing it back up
 	void			requestResolutionUpdate();
 	void			checkSettings();
-	void			restartDisplay(BOOL show_progress_bar);
-	BOOL			changeDisplaySettings(LLCoordScreen size, BOOL enable_vsync, BOOL show_progress_bar);
-	BOOL			getIgnoreDestroyWindow() { return mIgnoreActivate; }
+	void			restartDisplay(bool show_progress_bar);
+	bool			changeDisplaySettings(LLCoordScreen size, bool enable_vsync, bool show_progress_bar);
+	bool			getIgnoreDestroyWindow() { return mIgnoreActivate; }
 	F32				getWorldViewAspectRatio() const;
 	const LLVector2& getDisplayScale() const { return mDisplayScale; }
 	void			calcDisplayScale();
@@ -466,7 +466,7 @@ private:
 	void			switchToolByMask(MASK mask);
 	void			destroyWindow();
 	void			drawMouselookInstructions();
-	void			stopGL(BOOL save_state = TRUE);
+	void			stopGL(bool save_state = true);
 	void			restoreGL(const std::string& progress_message = LLStringUtil::null);
 	void			initFonts(F32 zoom_factor = 1.f);
 	void			schedulePick(LLPickInfo& pick_info);
@@ -493,9 +493,9 @@ private:
 	LLCoordGL		mCurrentMousePoint;			// last mouse position in GL coords
 	LLCoordGL		mLastMousePoint;		// Mouse point at last frame.
 	LLCoordGL		mCurrentMouseDelta;		//amount mouse moved this frame
-	BOOL			mLeftMouseDown;
-	BOOL			mMiddleMouseDown;
-	BOOL			mRightMouseDown;
+	bool			mLeftMouseDown;
+	bool			mMiddleMouseDown;
+	bool			mRightMouseDown;
 
 	LLProgressView	*mProgressView;
 
@@ -504,9 +504,9 @@ private:
 	std::string		mLastToolTipMessage;
 	LLRect			mToolTipStickyRect;			// Once a tool tip is shown, it will stay visible until the mouse leaves this rect.
 
-	BOOL			mMouseInWindow;				// True if the mouse is over our window or if we have captured the mouse.
-	BOOL			mFocusCycleMode;
-    BOOL            mAllowMouseDragging;
+	bool			mMouseInWindow;				// True if the mouse is over our window or if we have captured the mouse.
+	bool			mFocusCycleMode;
+    bool            mAllowMouseDragging;
     LLFrameTimer    mMouseDownTimer;
 	typedef std::set<LLHandle<LLView> > view_handle_set_t;
 	view_handle_set_t mMouseHoverViews;
@@ -514,8 +514,8 @@ private:
 	// Variables used for tool override switching based on modifier keys.  JC
 	MASK			mLastMask;			// used to detect changes in modifier mask
 	LLTool*			mToolStored;		// the tool we're overriding
-	BOOL			mHideCursorPermanent;	// true during drags, mouselook
-	BOOL            mCursorHidden;
+	bool			mHideCursorPermanent;	// true during drags, mouselook
+	bool            mCursorHidden;
 	LLPickInfo		mLastPick;
 	std::vector<LLPickInfo> mPicks;
 	LLRect			mPickScreenRegion; // area of frame buffer for rendering pick frames (generally follows mouse to avoid going offscreen)
@@ -523,7 +523,7 @@ private:
 
 	std::string		mOverlayTitle;		// Used for special titles such as "Second Life - Special E3 2003 Beta"
 
-	BOOL			mIgnoreActivate;
+	bool			mIgnoreActivate;
 
 	std::string		mInitAlert;			// Window / GL initialization requires an alert
 
@@ -570,9 +570,9 @@ extern S32				gDebugRaycastFaceHit;
 extern LLVector4a		gDebugRaycastStart;
 extern LLVector4a		gDebugRaycastEnd;
 
-extern BOOL			gDisplayCameraPos;
-extern BOOL			gDisplayWindInfo;
-extern BOOL			gDisplayFOV;
-extern BOOL			gDisplayBadge;
+extern bool			gDisplayCameraPos;
+extern bool			gDisplayWindInfo;
+extern bool			gDisplayFOV;
+extern bool			gDisplayBadge;
 
 #endif