diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
| commit | 32df877cd73b5b6a3672d0159c982077a4b67a9d (patch) | |
| tree | 3db2802f0ab39f2d7b1264e2ac1d3599f1a3bd5a /indra/llmath | |
| parent | eccc9057d9d9799d3d5056bdfe255bd9e5e2be6a (diff) | |
| parent | e028ae4f023420bedd4e4106f4749e700a14c3cc (diff) | |
Merge branch 'develop' into marchcat/c-develop
# Conflicts:
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llmatrix3a.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llmatrix4a.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llrigginginfo.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llvector4a.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/llvolumeoctree.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/v3colorutil.h | 1 |
6 files changed, 11 insertions, 0 deletions
diff --git a/indra/llmath/llmatrix3a.cpp b/indra/llmath/llmatrix3a.cpp index 48a72e71e1..c0b00201cf 100644 --- a/indra/llmath/llmatrix3a.cpp +++ b/indra/llmath/llmatrix3a.cpp @@ -24,6 +24,8 @@ * $/LicenseInfo$ */ +#include "linden_common.h" + #include "llmath.h" static LL_ALIGN_16(const F32 M_IDENT_3A[12]) = diff --git a/indra/llmath/llmatrix4a.cpp b/indra/llmath/llmatrix4a.cpp index 00e30a248b..bfb4c2b07a 100644 --- a/indra/llmath/llmatrix4a.cpp +++ b/indra/llmath/llmatrix4a.cpp @@ -24,6 +24,8 @@ * $/LicenseInfo$ */ +#include "linden_common.h" + #include "llmath.h" #include "llmatrix4a.h" diff --git a/indra/llmath/llrigginginfo.cpp b/indra/llmath/llrigginginfo.cpp index 23dbddd78e..2f59f685d5 100644 --- a/indra/llmath/llrigginginfo.cpp +++ b/indra/llmath/llrigginginfo.cpp @@ -24,6 +24,8 @@ * $/LicenseInfo$ */ +#include "linden_common.h" + #include "llmath.h" #include "llrigginginfo.h" diff --git a/indra/llmath/llvector4a.cpp b/indra/llmath/llvector4a.cpp index 0ac91366b6..b81d50f0f9 100644 --- a/indra/llmath/llvector4a.cpp +++ b/indra/llmath/llvector4a.cpp @@ -24,6 +24,8 @@ * $/LicenseInfo$ */ +#include "linden_common.h" + #include "llmemory.h" #include "llmath.h" #include "llquantize.h" diff --git a/indra/llmath/llvolumeoctree.cpp b/indra/llmath/llvolumeoctree.cpp index 71288daa89..141317ee8d 100644 --- a/indra/llmath/llvolumeoctree.cpp +++ b/indra/llmath/llvolumeoctree.cpp @@ -24,6 +24,8 @@ * $/LicenseInfo$ */ +#include "linden_common.h" + #include "llvolumeoctree.h" #include "llvector4a.h" diff --git a/indra/llmath/v3colorutil.h b/indra/llmath/v3colorutil.h index 1378d46450..4dc3100443 100644 --- a/indra/llmath/v3colorutil.h +++ b/indra/llmath/v3colorutil.h @@ -28,6 +28,7 @@ #define LL_V3COLORUTIL_H #include "v3color.h" +#include "v4color.h" inline LLColor3 componentDiv(const LLColor3& left, const LLColor3& right) { |