diff options
| author | McCabe Maxsted | 2011-03-09 20:39:15 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-09 20:39:15 -0700 |
| commit | 9440d31c6e95527a9027608c9c4b55aa91378451 (patch) | |
| tree | d990e5d472c7f098d4f8e71c88e73974dce11524 /linden/indra/newview | |
| parent | #787: Horizontal mouse scrolling support, patch by Kakurady Drakenar (diff) | |
| parent | fix llerrs crash "Vertex buffer destroyed while mapped!" in sse2 codepath (diff) | |
| download | meta-impy-9440d31c6e95527a9027608c9c4b55aa91378451.zip meta-impy-9440d31c6e95527a9027608c9c4b55aa91378451.tar.gz meta-impy-9440d31c6e95527a9027608c9c4b55aa91378451.tar.bz2 meta-impy-9440d31c6e95527a9027608c9c4b55aa91378451.tar.xz | |
Merge remote-tracking branch 'armin/weekly' into weekly
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llviewerjointmesh_sse2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerjointmesh_sse2.cpp b/linden/indra/newview/llviewerjointmesh_sse2.cpp index 550044c..450582f 100644 --- a/linden/indra/newview/llviewerjointmesh_sse2.cpp +++ b/linden/indra/newview/llviewerjointmesh_sse2.cpp | |||
| @@ -114,7 +114,7 @@ void LLViewerJointMesh::updateGeometrySSE2(LLFace *face, LLPolyMesh *mesh) | |||
| 114 | ((LLV4Matrix3)blend_mat).multiply(normals[index], o_normals[index]); | 114 | ((LLV4Matrix3)blend_mat).multiply(normals[index], o_normals[index]); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | //setBuffer(0) called in LLVOAvatar::renderSkinned | 117 | buffer->setBuffer(0); |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | #else | 120 | #else |