From 7abecb48babe6a6f09bf6692ba55076546cfced9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 1 Dec 2008 17:39:58 -0600
Subject: Second Life viewer sources 1.22.0-RC

---
 linden/indra/newview/llviewershadermgr.cpp | 38 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'linden/indra/newview/llviewershadermgr.cpp')

diff --git a/linden/indra/newview/llviewershadermgr.cpp b/linden/indra/newview/llviewershadermgr.cpp
index a654120..44f6abe 100644
--- a/linden/indra/newview/llviewershadermgr.cpp
+++ b/linden/indra/newview/llviewershadermgr.cpp
@@ -108,7 +108,7 @@ GLint				gAvatarMatrixParam;
 LLViewerShaderMgr::LLViewerShaderMgr() :
 	mVertexShaderLevel(SHADER_COUNT, 0)
 {	
-/// Make sure WL Sky is the first program
+	/// Make sure WL Sky is the first program
 	mShaderList.push_back(&gWLSkyProgram);
 	mShaderList.push_back(&gWLCloudProgram);
 	mShaderList.push_back(&gAvatarProgram);
@@ -139,28 +139,28 @@ LLViewerShaderMgr * LLViewerShaderMgr::instance()
 	if(NULL == sInstance)
 	{
 		sInstance = new LLViewerShaderMgr();
-	}	
-	
-	return static_cast<LLViewerShaderMgr*>(sInstance);
 	}
 
+	return static_cast<LLViewerShaderMgr*>(sInstance);
+}
+
 void LLViewerShaderMgr::initAttribsAndUniforms(void)
-	{
+{
 	if (mReservedAttribs.empty())
-		{
+	{
 		mReservedAttribs.push_back("materialColor");
 		mReservedAttribs.push_back("specularColor");
 		mReservedAttribs.push_back("binormal");
-		
+
 		mAvatarAttribs.reserve(5);
 		mAvatarAttribs.push_back("weight");
 		mAvatarAttribs.push_back("clothing");
 		mAvatarAttribs.push_back("gWindDir");
 		mAvatarAttribs.push_back("gSinWaveParams");
 		mAvatarAttribs.push_back("gGravity");
-			
+
 		mAvatarUniforms.push_back("matrixPalette");
-			
+
 		mReservedUniforms.reserve(24);
 		mReservedUniforms.push_back("diffuseMap");
 		mReservedUniforms.push_back("specularMap");
@@ -186,16 +186,16 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void)
 		mReservedUniforms.push_back("cloud_scale");
 		mReservedUniforms.push_back("gamma");
 		mReservedUniforms.push_back("scene_light_strength");
-			
+
 		mWLUniforms.push_back("camPosLocal");
-			
+
 		mTerrainUniforms.reserve(5);
 		mTerrainUniforms.push_back("detail_0");
 		mTerrainUniforms.push_back("detail_1");
 		mTerrainUniforms.push_back("detail_2");
 		mTerrainUniforms.push_back("detail_3");
 		mTerrainUniforms.push_back("alpha_ramp");
-	
+
 		mGlowUniforms.push_back("glowDelta");
 		mGlowUniforms.push_back("glowStrength");
 
@@ -204,7 +204,7 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void)
 		mGlowExtractUniforms.push_back("lumWeights");
 		mGlowExtractUniforms.push_back("warmthWeights");
 		mGlowExtractUniforms.push_back("warmthAmount");
-	
+
 		mShinyUniforms.push_back("origin");
 
 		mWaterUniforms.reserve(12);
@@ -222,9 +222,9 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void)
 		mWaterUniforms.push_back("kd");
 		mWaterUniforms.push_back("refScale");
 		mWaterUniforms.push_back("waterHeight");
-		}
-	}
-
+	}	
+}
+	
 
 //============================================================================
 // Set Levels
@@ -1087,12 +1087,12 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
 }
 
 std::string LLViewerShaderMgr::getShaderDirPrefix(void)
-	{
+{
 	return gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "shaders/class");
-	}
+}
 
 void LLViewerShaderMgr::updateShaderUniforms(LLGLSLShader * shader)
-			{
+{
 	LLWLParamManager::instance()->updateShaderUniforms(shader);
 	LLWaterParamManager::instance()->updateShaderUniforms(shader);
 }
-- 
cgit v1.1


From a87e38229921b48c32187c672a942516722f1b52 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 11 Jan 2009 16:10:39 -0600
Subject: Second Life viewer sources 1.22.5-RC

---
 linden/indra/newview/llviewershadermgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/llviewershadermgr.cpp')

diff --git a/linden/indra/newview/llviewershadermgr.cpp b/linden/indra/newview/llviewershadermgr.cpp
index 44f6abe..dab9e82 100644
--- a/linden/indra/newview/llviewershadermgr.cpp
+++ b/linden/indra/newview/llviewershadermgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
-- 
cgit v1.1