summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-06-08 15:36:42 -0700
committerCallum Prentice <callum@gmail.com>2017-06-08 15:36:42 -0700
commit07185d300d7879fc4d8d268210fa2c440efe02f4 (patch)
tree761fcb3e968339bc04882ea591f56af2fb175187 /indra/llprimitive
parent8d36da00c885f31739ce6bf6dbc162a6ef3a15a1 (diff)
parentcf5865c6e2b27918b526431ccc4309bfc702534e (diff)
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/lldaeloader.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 76d3a405d8..768dc8284b 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -305,6 +305,8 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
}
face = LLVolumeFace();
+ face.mExtents[0].set(v[0], v[1], v[2]);
+ face.mExtents[1].set(v[0], v[1], v[2]);
point_map.clear();
}
}
@@ -549,6 +551,8 @@ LLModel::EModelStatus load_face_from_dom_polylist(std::vector<LLVolumeFace>& fac
}
face = LLVolumeFace();
+ face.mExtents[0].set(v[0], v[1], v[2]);
+ face.mExtents[1].set(v[0], v[1], v[2]);
verts.clear();
indices.clear();
point_map.clear();