From cc5f10cb2de135e3b22821663ab7fc04774691cf Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 31 Jul 2021 19:04:00 -0400
Subject: [PATCH] Small code cleanup
---
indra/llmath/llvolume.cpp | 8 ++++----
indra/llmath/llvolumeoctree.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index b98ce39da85..52d6f221b00 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4011,7 +4011,7 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
}
S32 LLVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end,
- S32 face,
+ S32 face_idx,
LLVector4a* intersection,LLVector2* tex_coord, LLVector4a* normal, LLVector4a* tangent_out)
{
S32 hit_face = -1;
@@ -4019,15 +4019,15 @@ S32 LLVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& en
S32 start_face;
S32 end_face;
- if (face == -1) // ALL_SIDES
+ if (face_idx == -1) // ALL_SIDES
{
start_face = 0;
end_face = getNumVolumeFaces() - 1;
}
else
{
- start_face = face;
- end_face = face;
+ start_face = face_idx;
+ end_face = face_idx;
}
LLVector4a dir;
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h
index 934e0e2d041..9967548ae7e 100644
--- a/indra/llmath/llvolumeoctree.h
+++ b/indra/llmath/llvolumeoctree.h
@@ -34,7 +34,7 @@
#include "llvolume.h"
#include "llvector4a.h"
-class LLVolumeTriangle : public LLRefCount
+class LLVolumeTriangle final : public LLRefCount
{
public:
void* operator new(size_t size)
@@ -75,7 +75,7 @@ class LLVolumeTriangle : public LLRefCount
};
-class LLVolumeOctreeListener : public LLOctreeListener<LLVolumeTriangle>
+class LLVolumeOctreeListener final : public LLOctreeListener<LLVolumeTriangle>
{
public:
@@ -134,7 +134,7 @@ class LLOctreeTriangleRayIntersect : public LLOctreeTraveler<LLVolumeTriangle>
virtual void visit(const LLOctreeNode<LLVolumeTriangle>* node);
};
-class LLVolumeOctreeValidate : public LLOctreeTraveler<LLVolumeTriangle>
+class LLVolumeOctreeValidate final : public LLOctreeTraveler<LLVolumeTriangle>
{
virtual void visit(const LLOctreeNode<LLVolumeTriangle>* branch);
};
--
GitLab