From 44f904b680d77ba85a740ac73e52fd54796a8005 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 26 Nov 2016 19:57:12 +0100
Subject: [PATCH] Sync with upstream

---
 indra/llrender/llrender.h    | 2 +-
 indra/llrender/llshadermgr.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 0b17ee9ed7..a67fb8da52 100644
--- 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();
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index ed3ebabdc5..e54a965fbc 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -174,6 +174,7 @@ public:
 		
 		SPECULAR_COLOR,
 		ENVIRONMENT_INTENSITY,
+		
 		AVATAR_MATRIX,
 		AVATAR_TRANSLATION,