Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Conflicts: indra/llrender/llvertexbuffer.h Chose Shyotl's.
2012-07-11 23:23:31 -04:00
parent 1df635a164 bca4cf8584
commit 44b69f3d3e
9 changed files with 139 additions and 228 deletions
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -809,7 +809,11 @@ void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LL

 	gGL.flush();
 	glLineWidth(2.5f);
-	glLineStipple(2, 0x3333 << shift);
+	if (!LLGLSLShader::sNoFixedFunction)
+	{
+		glLineStipple(2, 0x3333 << shift);
+	}
+

 	gGL.begin(LLRender::LINES);
 	{