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

Merge Maint A to development

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h
index ab1cd715ab..ffc3544c08 100644
--- a/indra/newview/llviewerpartsim.h
+++ b/indra/newview/llviewerpartsim.h
@@ -95,11 +95,11 @@ public:
 
 	void cleanup();
 
-	BOOL addPart(LLViewerPart* part, const F32 desired_size = -1.f);
+	bool addPart(LLViewerPart* part, const F32 desired_size = -1.f);
 	
 	void updateParticles(const F32 lastdt);
 
-	BOOL posInGroup(const LLVector3 &pos, const F32 desired_size = -1.f);
+	bool posInGroup(const LLVector3 &pos, const F32 desired_size = -1.f);
 
 	void shift(const LLVector3 &offset);
 
@@ -117,7 +117,7 @@ public:
 	
 	LLPointer<LLVOPartGroup> mVOPartGroupp;
 
-	BOOL mUniformParticles;
+	bool mUniformParticles;
 	U32 mID;
 
 	F32 mSkippedTime;
@@ -152,7 +152,7 @@ public:
 
 	void cleanupRegion(LLViewerRegion *regionp);
 
-	static BOOL shouldAddPart(); // Just decides whether this particle should be added or not (for particle count capping)
+	static bool shouldAddPart(); // Just decides whether this particle should be added or not (for particle count capping)
 	F32 maxRate() // Return maximum particle generation rate
 	{
 		if (sParticleCount >= MAX_PART_COUNT)
@@ -177,7 +177,7 @@ public:
 
 	friend class LLViewerPartGroup;
 
-	BOOL aboveParticleLimit() const { return sParticleCount > sMaxParticleCount; }
+	bool aboveParticleLimit() const { return sParticleCount > sMaxParticleCount; }
 
 	static void setMaxPartCount(const S32 max_parts)	{ sMaxParticleCount = max_parts; }
 	static S32  getMaxPartCount()						{ return sMaxParticleCount; }