diff options
Diffstat (limited to 'linden/indra/newview/lldrawpooltree.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpooltree.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp index 36a4393..2f380f8 100644 --- a/linden/indra/newview/lldrawpooltree.cpp +++ b/linden/indra/newview/lldrawpooltree.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 5 | * Copyright (c) 2002-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -36,6 +37,7 @@ | |||
36 | #include "llvotree.h" | 37 | #include "llvotree.h" |
37 | #include "pipeline.h" | 38 | #include "pipeline.h" |
38 | #include "llviewercamera.h" | 39 | #include "llviewercamera.h" |
40 | #include "llglslshader.h" | ||
39 | 41 | ||
40 | S32 LLDrawPoolTree::sDiffTex = 0; | 42 | S32 LLDrawPoolTree::sDiffTex = 0; |
41 | 43 | ||
@@ -286,5 +288,5 @@ LLColor3 LLDrawPoolTree::getDebugColor() const | |||
286 | 288 | ||
287 | S32 LLDrawPoolTree::getMaterialAttribIndex() | 289 | S32 LLDrawPoolTree::getMaterialAttribIndex() |
288 | { | 290 | { |
289 | return gPipeline.mObjectSimpleProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR]; | 291 | return gObjectSimpleProgram.mAttribute[LLShaderMgr::MATERIAL_COLOR]; |
290 | } | 292 | } |