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

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index c51f583ebc..17ec51caab 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -35,7 +35,7 @@
 class LLViewerShaderMgr: public LLShaderMgr
 {
 public:
-	static BOOL sInitialized;
+	static bool sInitialized;
 	static bool sSkipReload;
 
 	LLViewerShaderMgr();
@@ -58,12 +58,12 @@ public:
     // name of a file error happened at, otherwise
     // returns an empty string
     std::string loadBasicShaders();
-	BOOL loadShadersEffects();
-	BOOL loadShadersDeferred();
-	BOOL loadShadersObject();
-	BOOL loadShadersAvatar();
-	BOOL loadShadersWater();
-	BOOL loadShadersInterface();
+	bool loadShadersEffects();
+	bool loadShadersDeferred();
+	bool loadShadersObject();
+	bool loadShadersAvatar();
+	bool loadShadersWater();
+	bool loadShadersInterface();
 
 	std::vector<S32> mShaderLevel;
 	S32	mMaxAvatarShaderLevel;