Sync with upstream

2016-11-26 19:57:12 +01:00 · 2016-11-26 19:57:12 +01:00 · 44f904b680
parent be39230dca
commit 44f904b680
2 changed files with 2 additions and 1 deletions
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@ -331,7 +331,7 @@ public:
 		MM_TEXTURE2,
 		MM_TEXTURE3,
 		NUM_MATRIX_MODES,
-		MM_TEXTURE,
+		MM_TEXTURE
 	} eMatrixMode;

 	LLRender();
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@ -174,6 +174,7 @@ public:
 		
 		SPECULAR_COLOR,
 		ENVIRONMENT_INTENSITY,
+		
 		AVATAR_MATRIX,
 		AVATAR_TRANSLATION,