diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llfloaterpostcard.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/llfloaterpostcard.h')
| -rw-r--r-- | indra/newview/llfloaterpostcard.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpostcard.h b/indra/newview/llfloaterpostcard.h index 087649f159..5abb97e15f 100644 --- a/indra/newview/llfloaterpostcard.h +++ b/indra/newview/llfloaterpostcard.h @@ -36,12 +36,13 @@ #include "llfloater.h" #include "llcheckboxctrl.h" -#include "llmemory.h" -#include "llimagegl.h" +#include "llpointer.h" class LLTextEditor; class LLLineEditor; class LLButton; +class LLImageGL; +class LLImageJPEG; class LLFloaterPostcard : public LLFloater @@ -50,7 +51,6 @@ public: LLFloaterPostcard(LLImageJPEG* jpeg, LLImageGL *img, const LLVector2& img_scale, const LLVector3d& pos_taken_global); virtual ~LLFloaterPostcard(); - virtual void init(); virtual BOOL postBuild(); virtual void draw(); |