diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-28 18:28:44 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-28 18:28:44 -0700 |
| commit | 88d913791ffa7ac8f79b5ae6f25aca42b4908e66 (patch) | |
| tree | 83104fe1a2d714be511b6669eae3944b87ad866b | |
| parent | d25e8e5ecf5b17e5c30d8eb9c08a6099792c0036 (diff) | |
| parent | 3c3ee709677a0c60420eae84a55a7b61113b4949 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
| -rw-r--r-- | .hgtags | 4 | ||||
| -rw-r--r-- | indra/newview/llface.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -277,9 +277,9 @@ d5f263687f43f278107363365938f0a214920a4b DRTVWR-119 d5f263687f43f278107363365938f0a214920a4b 3.3.0-beta1 5e8d2662f38a66eca6c591295f5880d47afc73f7 viewer-release-candidate 5e8d2662f38a66eca6c591295f5880d47afc73f7 3.3.0-release -dffd0457ee0745de65bf95f0642a5c9e46b8e2f0 viewer-beta-candidate -3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate +28b95a6a28dca3338d9a1f4f204b96678df9f6a5 viewer-beta-candidate b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start 3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 DRTVWR-125 b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start 3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 3.3.1-start +28b95a6a28dca3338d9a1f4f204b96678df9f6a5 3.3.1-beta1 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); |