diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-14 23:46:28 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-14 23:46:28 +0300 |
| commit | f8d5fc6a1fc1f2cca805b3196f0a442a29cfbabe (patch) | |
| tree | 8b009b64588d1ed8f46ba3528592f183f89ad1bb /indra/newview | |
| parent | e5cd4da823fe61e57c2d4bb829e39a587276af09 (diff) | |
| parent | b9ed5f9e79799d1b180b9b548c1093d771154d5e (diff) | |
Merge remote-tracking branch 'origin/sl-17218' into DRTVWR-543-maint
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llface.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llpanelloginlistener.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 445615fdd5..5201a27572 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1026,12 +1026,12 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po { const LLMatrix4& vol_mat = getWorldMatrix(); const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset); - const LLVector4a& normal4a = vf.mNormals[0]; - const LLVector4a& tangent = vf.mTangents[0]; - if (!&tangent) + if (! (vf.mNormals && vf.mTangents)) { return; } + const LLVector4a& normal4a = *vf.mNormals; + const LLVector4a& tangent = *vf.mTangents; LLVector4a binormal4a; binormal4a.setCross3(normal4a, tangent); diff --git a/indra/newview/llpanelloginlistener.cpp b/indra/newview/llpanelloginlistener.cpp index 33efde11f3..fb3e8dc244 100644 --- a/indra/newview/llpanelloginlistener.cpp +++ b/indra/newview/llpanelloginlistener.cpp @@ -47,5 +47,5 @@ LLPanelLoginListener::LLPanelLoginListener(LLPanelLogin* instance): void LLPanelLoginListener::onClickConnect(const LLSD&) const { - mPanel->onClickConnect(NULL); + mPanel->onClickConnect(false); } |