summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llvolume.cpp12
-rw-r--r--indra/llmath/llvolume.h12
-rw-r--r--indra/llmath/m4math.h16
3 files changed, 18 insertions, 22 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index e34c866a80..ecc4b09d10 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4181,18 +4181,6 @@ std::ostream& operator<<(std::ostream &s, const LLVolume *volumep)
}
-LLVolumeFace::LLVolumeFace()
-{
- mTypeMask = 0;
- mID = 0;
- mBeginS = 0;
- mBeginT = 0;
- mNumS = 0;
- mNumT = 0;
- mHasBinormals = FALSE;
-}
-
-
BOOL LLVolumeFace::create(LLVolume* volume, BOOL partial_build)
{
if (mTypeMask & CAP_MASK)
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 91415ee036..4bc8495ad3 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -761,7 +761,17 @@ public:
class LLVolumeFace
{
public:
- LLVolumeFace();
+ LLVolumeFace() :
+ mID(0),
+ mTypeMask(0),
+ mHasBinormals(FALSE),
+ mBeginS(0),
+ mBeginT(0),
+ mNumS(0),
+ mNumT(0)
+ {
+ }
+
BOOL create(LLVolume* volume, BOOL partial_build = FALSE);
void createBinormals();
diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h
index 7eacbf6542..790e77abc6 100644
--- a/indra/llmath/m4math.h
+++ b/indra/llmath/m4math.h
@@ -1,6 +1,6 @@
/**
* @file m4math.h
- * @brief LLMatrix3 class header file.
+ * @brief LLMatrix4 class header file.
*
* $LicenseInfo:firstyear=2000&license=viewergpl$
*
@@ -101,9 +101,13 @@ class LLMatrix4
public:
F32 mMatrix[NUM_VALUES_IN_MAT4][NUM_VALUES_IN_MAT4];
- LLMatrix4(); // Initializes Matrix to identity matrix
+ // Initializes Matrix to identity matrix
+ LLMatrix4()
+ {
+ setIdentity();
+ }
explicit LLMatrix4(const F32 *mat); // Initializes Matrix to values in mat
- explicit LLMatrix4(const LLMatrix3 &mat); // Initializes Matrix to valuee in mat and sets position to (0,0,0)
+ explicit LLMatrix4(const LLMatrix3 &mat); // Initializes Matrix to values in mat and sets position to (0,0,0)
explicit LLMatrix4(const LLQuaternion &q); // Initializes Matrix with rotation q and sets position to (0,0,0)
LLMatrix4(const LLMatrix3 &mat, const LLVector4 &pos); // Initializes Matrix to values in mat and pos
@@ -240,12 +244,6 @@ public:
friend std::ostream& operator<<(std::ostream& s, const LLMatrix4 &a); // Stream a
};
-
-inline LLMatrix4::LLMatrix4()
-{
- setIdentity();
-}
-
inline const LLMatrix4& LLMatrix4::setIdentity()
{
mMatrix[0][0] = 1.f;