merge changes for open-161

2013-01-22 14:45:22 -05:00 · 2013-01-22 14:45:22 -05:00 · d12627d8f7
parent 1378d4407f 30b48351f9
commit d12627d8f7
2 changed files with 3 additions and 1 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -646,6 +646,7 @@ Jonathan Yap
 	STORM-1872
 	STORM-1858
 	STORM-1862
+	OPEN-161
 Kadah Coba
 	STORM-1060
    STORM-1843
@ -1163,6 +1164,7 @@ Techwolf Lupindo
 	SNOW-746
 	VWR-12385
 	VWR-20893
+	OPEN-161
 Templar Merlin
 tenebrous pau
 	VWR-247
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@ -24,7 +24,7 @@
 * $/LicenseInfo$
 */

-#ifndef LL_LLTEXTURECACHE_
+#ifndef LL_LLTEXTURECACHE_H
 #define LL_LLTEXTURECACHE_H

 #include "lldir.h"