diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-18 14:46:32 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-18 14:46:32 -0400 |
| commit | ba1589d118db0c25f607c74f37834fe8feed9760 (patch) | |
| tree | 908e3940d8c9624b1b0591567a35b2314ed6277c /indra/llui/llui.h | |
| parent | 6c61a537918b5cc73336885f8bdd34943fda2482 (diff) | |
| parent | d36a9a7907a1528a8d163577a0770b50e6248802 (diff) | |
merged .hgtags
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index c583d58d5a..a04b232a28 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -33,6 +33,7 @@ #include "llrect.h" #include "llcontrol.h" #include "llcoord.h" +#include "llglslshader.h" #include "llinitparam.h" #include "llregistry.h" #include "lluicolor.h" @@ -47,6 +48,7 @@ // for initparam specialization #include "llfontgl.h" + class LLColor4; class LLVector3; class LLVector2; @@ -484,4 +486,7 @@ namespace LLInitParam }; } +extern LLGLSLShader gSolidColorProgram; +extern LLGLSLShader gUIProgram; + #endif |