diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/llmath/v4math.h | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/llmath/v4math.h')
| -rw-r--r-- | indra/llmath/v4math.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmath/v4math.h b/indra/llmath/v4math.h index 57dcad35fe..34b5f9e33c 100644 --- a/indra/llmath/v4math.h +++ b/indra/llmath/v4math.h @@ -312,7 +312,8 @@ inline bool operator!=(const LLVector4 &a, const LLVector4 &b) { return ( (a.mV[VX] != b.mV[VX]) ||(a.mV[VY] != b.mV[VY]) - ||(a.mV[VZ] != b.mV[VZ])); + ||(a.mV[VZ] != b.mV[VZ]) + ||(a.mV[VW] != b.mV[VW]) ); } inline const LLVector4& operator+=(LLVector4 &a, const LLVector4 &b) |