diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-10-08 17:06:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-08 17:06:20 +0300 |
| commit | 6ccae2d0ae977965202ecb45de77e46f8d0312b3 (patch) | |
| tree | 0819595c2a50aa7066b0c75b49d3b6c31f5636b9 /indra/llmath/llcoordframe.h | |
| parent | ccc7fffb22b347149bf807b9d92677e5616c5017 (diff) | |
| parent | 3dca9fc377e855b74a78a5c30464b468dcc82644 (diff) | |
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/llmath/llcoordframe.h')
| -rw-r--r-- | indra/llmath/llcoordframe.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llmath/llcoordframe.h b/indra/llmath/llcoordframe.h index aaa701f792..391d58dc27 100644 --- a/indra/llmath/llcoordframe.h +++ b/indra/llmath/llcoordframe.h @@ -61,7 +61,7 @@ public: //LLCoordFrame(const F32 *origin, const F32 *rotation); // Assumes "origin" is 1x3 and "rotation" is 1x9 array //LLCoordFrame(const F32 *origin_and_rotation); // Assumes "origin_and_rotation" is 1x12 array - bool isFinite() { return mOrigin.isFinite() && mXAxis.isFinite() && mYAxis.isFinite() && mZAxis.isFinite(); } + bool isFinite() const { return mOrigin.isFinite() && mXAxis.isFinite() && mYAxis.isFinite() && mZAxis.isFinite(); } void reset(); void resetAxes(); @@ -118,8 +118,6 @@ public: // Same as above, except it also includes the translation of the LLFrame // LLMatrix4 getMatrix4() const; // Returns position and axes in 4x4 matrix - // Returns matrix which expresses point in local frame in the parent frame - void getMatrixToParent(LLMatrix4 &mat) const; // Returns matrix which expresses point in parent frame in the local frame void getMatrixToLocal(LLMatrix4 &mat) const; // Returns matrix which expresses point in parent frame in the local frame |