diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
| commit | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (patch) | |
| tree | f0cc704c8af726f27164cb569cc77e6f55e533d2 /indra/newview/llvieweroctree.cpp | |
| parent | e56be73dc646d414c7a10621ac489add6762267b (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge changes for 5.1.5-release
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 023f1b92ba..5f0e21db71 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -465,7 +465,7 @@ LLViewerOctreeGroup::LLViewerOctreeGroup(OctreeNode* node) { LLVector4a tmp; tmp.splat(0.f); - mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[0] = mObjectBounds[1] = + mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[1] = mObjectExtents[0] = mObjectExtents[1] = tmp; mBounds[0] = node->getCenter(); |