diff options
author | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
commit | 5866bb7ef09b786f8f195770a70dc4289d183ca0 (patch) | |
tree | 0be3b5e63506bf30edd3748f9e31740ae9ebbaa8 /indra/newview/lllocalbitmaps.h | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
parent | a8192fbf60540e42dcff5f1efb8bf8cafbfac484 (diff) |
merge with release
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
-rwxr-xr-x | indra/newview/lllocalbitmaps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index 2ee84bf46e..47c077dcab 100755 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -30,11 +30,11 @@ #include "llavatarappearancedefines.h" #include "lleventtimer.h" -#include "llimage.h" #include "llpointer.h" #include "llwearabletype.h" class LLScrollListCtrl; +class LLImageRaw; class LLViewerObject; class LLLocalBitmap |