From 744f2e4951fc6fc1a1f08e97fc446e909c1fe39e Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 4 May 2010 12:14:47 -0500
Subject: [PATCH] Cleanup from review.
---
indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | 3 +--
indra/newview/lldrawpoolavatar.cpp | 2 +-
indra/newview/llvovolume.cpp | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index 6f027de6a23..7d18ae50366 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -54,8 +54,7 @@ void main()
color.rgb = scaleSoftClip(color.rgb);
- gl_FragColor = gl_Color;
- //gl_FragColor = color;
+ gl_FragColor = color;
//gl_FragColor = vec4(1,0,1,1);
//gl_FragColor = vec4(1,0,1,1)*shadow;
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index ac599caa5b7..a49cf8781ea 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1103,7 +1103,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
return;
}
- if (pass >= 7 && pass <= 9)
+ if (pass >= 7 && pass < 9)
{
LLGLEnable blend(GL_BLEND);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 220634897e3..1ed8da85a8a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3418,7 +3418,7 @@ void LLVolumeGeometryManager::getGeometry(LLSpatialGroup* group)
static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_VB("Volume");
static LLFastTimer::DeclareTimer FTM_REBUILD_VBO("VBO Rebuilt");
-LLDrawPoolAvatar* get_avatar_drawpool(LLViewerObject* vobj)
+static LLDrawPoolAvatar* get_avatar_drawpool(LLViewerObject* vobj)
{
LLVOAvatar* avatar = vobj->getAvatar();
--
GitLab