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

Merge Maint A to development

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h
index 426dd926ae..2edd11b1f4 100644
--- a/indra/newview/llfloaterimagepreview.h
+++ b/indra/newview/llfloaterimagepreview.h
@@ -53,15 +53,15 @@ protected:
 	void setPreviewTarget(LLImageRaw *imagep, F32 distance);
 	void setTexture(U32 name) { mTextureName = name; }
 
-	BOOL render() override;
+    bool render() override;
 	void refresh();
 	void rotate(F32 yaw_radians, F32 pitch_radians);
 	void zoom(F32 zoom_amt);
 	void pan(F32 right, F32 up);
-	virtual BOOL needsRender() override { return mNeedsUpdate; }
+	virtual bool needsRender() override { return mNeedsUpdate; }
 
  protected:
-	BOOL        mNeedsUpdate;
+	bool        mNeedsUpdate;
 	U32         mTextureName;
 	F32			mCameraDistance;
 	F32			mCameraYaw;
@@ -83,19 +83,19 @@ public:
 
 	S8 getType() const override;
 
-	void setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, BOOL male);
+	void setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, bool male);
 	void setTexture(U32 name) { mTextureName = name; }
 	void clearPreviewTexture(const std::string& mesh_name);
 
-	BOOL	render() override;
+    bool	render() override;
 	void	refresh();
 	void	rotate(F32 yaw_radians, F32 pitch_radians);
 	void	zoom(F32 zoom_amt);
 	void	pan(F32 right, F32 up);
-	virtual BOOL needsRender() override { return mNeedsUpdate; }
+	virtual bool needsRender() override { return mNeedsUpdate; }
 
 protected:
-	BOOL		mNeedsUpdate;
+	bool		mNeedsUpdate;
 	LLJoint*	mTargetJoint;
 	LLViewerJointMesh*	mTargetMesh;
 	F32			mCameraDistance;
@@ -113,14 +113,14 @@ public:
 	LLFloaterImagePreview(const std::string& filename);
 	virtual ~LLFloaterImagePreview();
 
-	BOOL postBuild() override;
+    bool postBuild() override;
 
     S32 getExpectedUploadCost() const override;
 	
-	BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
-	BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
-	BOOL handleHover(S32 x, S32 y, MASK mask) override;
-	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+    bool handleMouseDown(S32 x, S32 y, MASK mask) override;
+    bool handleMouseUp(S32 x, S32 y, MASK mask) override;
+    bool handleHover(S32 x, S32 y, MASK mask) override;
+    bool handleScrollWheel(S32 x, S32 y, S32 clicks) override;
 
 	static void onMouseCaptureLostImagePreview(LLMouseHandler*);