From 27a724c1fc6fd7a46ed7c5d2f9cd5334f2052a2a Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Fri, 20 Sep 2013 10:06:32 -0600
Subject: [PATCH] Fix 3.6.6 merge breakage, spotted by Sovereign Engineer

---
 indra/llrender/llshadermgr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index 9950313510..225599baf5 100755
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -171,12 +171,12 @@ public:
 
 		SPECULAR_COLOR,
 		ENVIRONMENT_INTENSITY,
+		DISPLAY_GAMMA,
+		
 // <FS:CR> Import Vignette from Exodus
 		EXO_RENDER_VIGNETTE,
 		EXO_RENDER_SCREEN,
 // </FS:CR> Import Vignette from Exodus
-		
-		DISPLAY_GAMMA,
 
 		END_RESERVED_UNIFORMS
 	} eGLSLReservedUniforms;