From 38ad8611c988e6ca0caae95d397e3ce67f1ceb36 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 27 Mar 2012 10:55:15 -0400 Subject: MAINT-710: Fix for VertexBufferStrider could not find valid vertex data. (from Firestorm) --- indra/newview/llface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index cd33a19a2a..cfb4147e71 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1838,7 +1838,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } } - if (rebuild_color) + if (rebuild_color && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_COLOR) ) { LLFastTimer t(FTM_FACE_GEOM_COLOR); mVertexBuffer->getColorStrider(colors, mGeomIndex, mGeomCount, map_range); -- cgit v1.2.3 From e516b16be7c05f8509c860a63d56ade070b02ccb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 27 Mar 2012 15:35:55 -0400 Subject: Added tag viewer-beta-candidate for changeset 28b95a6a28dc --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 261b3ef140..d073d97888 100644 --- a/.hgtags +++ b/.hgtags @@ -279,3 +279,5 @@ d5f263687f43f278107363365938f0a214920a4b 3.3.0-beta1 5e8d2662f38a66eca6c591295f5880d47afc73f7 3.3.0-release dffd0457ee0745de65bf95f0642a5c9e46b8e2f0 viewer-beta-candidate 3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate +3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate +28b95a6a28dca3338d9a1f4f204b96678df9f6a5 viewer-beta-candidate -- cgit v1.2.3 From 3c3ee709677a0c60420eae84a55a7b61113b4949 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 28 Mar 2012 20:09:54 -0400 Subject: Added tag 3.3.1-beta1 for changeset 28b95a6a28dc --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index eb4a47e2cd..1ae758e8ea 100644 --- a/.hgtags +++ b/.hgtags @@ -282,3 +282,4 @@ b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start 3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 DRTVWR-125 b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start 3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 3.3.1-start +28b95a6a28dca3338d9a1f4f204b96678df9f6a5 3.3.1-beta1 -- cgit v1.2.3