diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-09-09 01:26:44 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-09-09 01:26:44 +0000 |
| commit | 58bce2d205bee3f5adb33b15efe73098e77429eb (patch) | |
| tree | d591209e661af81fce315ceadc1179d277c579d8 /indra/llplugin | |
| parent | a67d2dd1a4c490eae337ae930eac98c714033711 (diff) | |
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 2 | ||||
| -rw-r--r-- | indra/llplugin/llpluginclassmediaowner.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 7a8586fe2f..665a423d07 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -32,7 +32,7 @@ #ifndef LL_LLPLUGINCLASSMEDIA_H #define LL_LLPLUGINCLASSMEDIA_H -#include "llgl.h" +#include "llgltypes.h" #include "llpluginprocessparent.h" #include "llrect.h" #include "llpluginclassmediaowner.h" diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h index 3ae176cbeb..df6de0925e 100644 --- a/indra/llplugin/llpluginclassmediaowner.h +++ b/indra/llplugin/llpluginclassmediaowner.h @@ -32,7 +32,6 @@ #ifndef LL_LLPLUGINCLASSMEDIAOWNER_H #define LL_LLPLUGINCLASSMEDIAOWNER_H -#include "llgl.h" #include "llpluginprocessparent.h" #include "llrect.h" #include <queue> |