Fix 3.6.6 merge breakage, spotted by Sovereign Engineer

2013-09-20 10:06:32 -06:00 · 2013-09-20 10:06:32 -06:00 · 27a724c1fc
parent d41651f829
commit 27a724c1fc
1 changed files with 2 additions and 2 deletions
--- 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;