diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-28 22:33:51 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-28 22:33:51 +0300 |
| commit | 4e43097c77a5efc1353eec13cdcb0f2c3e3bca92 (patch) | |
| tree | 5417b02fd09c31c52c79d5e52e5323364673bf91 /indra/llmath/llvector4a.h | |
| parent | 54beabc63665b3b431e901f36ea695712ca7e6bb (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge branch 'master' into DRTVWR-518-ui
# Conflicts:
# indra/newview/llfloaterbuycurrency.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.h
# indra/newview/skins/default/xui/en/floater_buy_currency.xml
Diffstat (limited to 'indra/llmath/llvector4a.h')
| -rw-r--r-- | indra/llmath/llvector4a.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmath/llvector4a.h b/indra/llmath/llvector4a.h index 222f3cf235..27abf39537 100644 --- a/indra/llmath/llvector4a.h +++ b/indra/llmath/llvector4a.h @@ -46,10 +46,10 @@ class LLRotation; // of this writing, July 08, 2010) about getting it implemented before you resort to // LLVector3/LLVector4. ///////////////////////////////// -class LLVector4a; +struct LLVector4a; LL_ALIGN_PREFIX(16) -class LLVector4a +struct LLVector4a { public: @@ -92,6 +92,7 @@ public: // CONSTRUCTORS //////////////////////////////////// + //LLVector4a is plain data which should never have a default constructor or destructor(malloc&free won't trigger it) LLVector4a() { //DO NOT INITIALIZE -- The overhead is completely unnecessary ll_assert_aligned(this,16); |