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

1 files changed, 31 insertions, 32 deletions

diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 758e716c00..42ad0e423c 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -218,7 +218,7 @@ public:
 	}
 
 	static U32 sNodeCount;
-	static bool sNoDelete; //deletion of spatial groups and draw info not allowed if TRUE
+	static bool sNoDelete; //deletion of spatial groups and draw info not allowed if true
 
 	typedef std::vector<LLPointer<LLSpatialGroup> > sg_vector_t;
 	typedef std::vector<LLPointer<LLSpatialBridge> > bridge_list_t;
@@ -280,7 +280,7 @@ public:
 
 	LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part);
 
-	BOOL isHUDGroup() ;
+	bool isHUDGroup() ;
 	
 	void clearDrawMap();
 	void validate();
@@ -292,9 +292,9 @@ public:
 
 	LLSpatialGroup* getParent();
 
-	BOOL addObject(LLDrawable *drawablep);
-	BOOL removeObject(LLDrawable *drawablep, BOOL from_octree = FALSE);
-	BOOL updateInGroup(LLDrawable *drawablep, BOOL immediate = FALSE); // Update position if it's in the group
+	bool addObject(LLDrawable *drawablep);
+	bool removeObject(LLDrawable *drawablep, bool from_octree = false);
+	bool updateInGroup(LLDrawable *drawablep, bool immediate = false); // Update position if it's in the group
 	void expandExtents(const LLVector4a* addingExtents, const LLXformMatrix& currentTransform);
 	void shift(const LLVector4a &offset);
 
@@ -303,7 +303,7 @@ public:
 	
 	void updateDistance(LLCamera& camera);
 	F32 getUpdateUrgency() const;
-	BOOL changeLOD();
+	bool changeLOD();
 	void rebuildGeom();
 	void rebuildMesh();
 
@@ -314,10 +314,10 @@ public:
 	void drawObjectBox(LLColor4 col);
 
     LLDrawable* lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end,
-        BOOL pick_transparent,
-        BOOL pick_rigged,
-        BOOL pick_unselectable,
-        BOOL pick_reflection_probe,
+        bool pick_transparent,
+        bool pick_rigged,
+        bool pick_unselectable,
+        bool pick_reflection_probe,
         S32* face_hit,                          // return the face hit
         LLVector4a* intersection = NULL,         // return the intersection point
         LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -385,17 +385,17 @@ public:
 class LLSpatialPartition: public LLViewerOctreePartition, public LLGeometryManager
 {
 public:
-	LLSpatialPartition(U32 data_mask,  BOOL render_by_group, LLViewerRegion* regionp);
+	LLSpatialPartition(U32 data_mask,  bool render_by_group, LLViewerRegion* regionp);
 	virtual ~LLSpatialPartition();
 
-	LLSpatialGroup *put(LLDrawable *drawablep, BOOL was_visible = FALSE);
-	BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp);
+	LLSpatialGroup *put(LLDrawable *drawablep, bool was_visible = false);
+	bool remove(LLDrawable *drawablep, LLSpatialGroup *curp);
 	
 	LLDrawable* lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end,
-									 BOOL pick_transparent, 
-									 BOOL pick_rigged,
-                                     BOOL pick_unselectable,
-                                     BOOL pick_reflection_probe,
+									 bool pick_transparent, 
+									 bool pick_rigged,
+                                     bool pick_unselectable,
+                                     bool pick_reflection_probe,
 									 S32* face_hit,                          // return the face hit
 									 LLVector4a* intersection = NULL,         // return the intersection point
 									 LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -405,7 +405,7 @@ public:
 	
 	
 	// If the drawable moves, move it here.
-	virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE);
+	virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, bool immediate = false);
 	virtual void shift(const LLVector4a &offset);
 
 	virtual F32 calcDistance(LLSpatialGroup* group, LLCamera& camera);
@@ -414,33 +414,33 @@ public:
 	virtual void rebuildGeom(LLSpatialGroup* group);
 	virtual void rebuildMesh(LLSpatialGroup* group);
 
-	BOOL visibleObjectsInFrustum(LLCamera& camera);
+	bool visibleObjectsInFrustum(LLCamera& camera);
 	/*virtual*/ S32 cull(LLCamera &camera, bool do_occlusion=false); // Cull on arbitrary frustum
-	S32 cull(LLCamera &camera, std::vector<LLDrawable *>* results, BOOL for_select); // Cull on arbitrary frustum
+	S32 cull(LLCamera &camera, std::vector<LLDrawable *>* results, bool for_select); // Cull on arbitrary frustum
 	
-	BOOL isVisible(const LLVector3& v);
+	bool isVisible(const LLVector3& v);
 	bool isHUDPartition() ;
 	
 	LLSpatialBridge* asBridge() { return mBridge; }
-	BOOL isBridge() { return asBridge() != NULL; }
+	bool isBridge() { return asBridge() != NULL; }
 
 	void renderPhysicsShapes(bool depth_only);
 	void renderDebug();
 	void renderIntersectingBBoxes(LLCamera* camera);
 	void restoreGL();
 
-	BOOL getVisibleExtents(LLCamera& camera, LLVector3& visMin, LLVector3& visMax);
+	bool getVisibleExtents(LLCamera& camera, LLVector3& visMin, LLVector3& visMax);
 
 public:
 	LLSpatialBridge* mBridge; // NULL for non-LLSpatialBridge instances, otherwise, mBridge == this
 							// use a pointer instead of making "isBridge" and "asBridge" virtual so it's safe
 							// to call asBridge() from the destructor
 	
-	bool mInfiniteFarClip; // if TRUE, frustum culling ignores far clip plane
+	bool mInfiniteFarClip; // if true, frustum culling ignores far clip plane
 	const bool mRenderByGroup;
 	U32 mVertexDataMask;
 	F32 mSlopRatio; //percentage distance must change before drawables receive LOD update (default is 0.25);
-    bool mDepthMask; //if TRUE, objects in this partition will be written to depth during alpha rendering
+    bool mDepthMask; //if true, objects in this partition will be written to depth during alpha rendering
 };
 
 // class for creating bridges between spatial partitions
@@ -452,18 +452,18 @@ protected:
 public:
 	typedef std::vector<LLPointer<LLSpatialBridge> > bridge_vector_t;
 	
-	LLSpatialBridge(LLDrawable* root, BOOL render_by_group, U32 data_mask, LLViewerRegion* regionp);
+	LLSpatialBridge(LLDrawable* root, bool render_by_group, U32 data_mask, LLViewerRegion* regionp);
 	
 	void destroyTree();
 
-	virtual BOOL isSpatialBridge() const		{ return TRUE; }
+	virtual bool isSpatialBridge() const		{ return true; }
 	virtual void updateSpatialExtents();
 	virtual void updateBinRadius();
-	virtual void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, BOOL for_select = FALSE);
+	virtual void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, bool for_select = false);
 	virtual void updateDistance(LLCamera& camera_in, bool force_update);
 	virtual void makeActive();
-	virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE);
-	virtual BOOL updateMove();
+	virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, bool immediate = false);
+	virtual bool updateMove();
 	virtual void shiftPos(const LLVector4a& vec);
 	virtual void cleanupReferences();
 	virtual LLSpatialPartition* asPartition()		{ return this; }
@@ -678,7 +678,7 @@ class LLVolumeGeometryManager: public LLGeometryManager
 	virtual void rebuildMesh(LLSpatialGroup* group);
 	virtual void getGeometry(LLSpatialGroup* group);
     virtual void addGeometryCount(LLSpatialGroup* group, U32& vertex_count, U32& index_count);
-	U32 genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace** faces, U32 face_count, BOOL distance_sort = FALSE, BOOL batch_textures = FALSE, BOOL rigged = FALSE);
+	U32 genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace** faces, U32 face_count, bool distance_sort = false, bool batch_textures = false, bool rigged = false);
 	void registerFace(LLSpatialGroup* group, LLFace* facep, U32 type);
 
 private:
@@ -729,7 +729,6 @@ class LLControlAVBridge : public LLVolumeBridge
 	using super = LLVolumeBridge;
 public:
 	LLControlAVBridge(LLDrawable* drawablep, LLViewerRegion* regionp);
-	virtual void updateSpatialExtents();
 };
 
 class LLHUDBridge : public LLVolumeBridge