diff options
author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/newview/llfloaterpostcard.h | |
parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/newview/llfloaterpostcard.h')
-rw-r--r-- | indra/newview/llfloaterpostcard.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpostcard.h b/indra/newview/llfloaterpostcard.h index 542d117403..7ca1278776 100644 --- a/indra/newview/llfloaterpostcard.h +++ b/indra/newview/llfloaterpostcard.h @@ -29,7 +29,7 @@ public: virtual void init(); virtual BOOL postBuild(); virtual void draw(); - + static LLFloaterPostcard* showFromSnapshot(LLImageJPEG *jpeg, LLImageGL *img, const LLVector2& img_scale, const LLVector3d& pos_taken_global); static void onClickCancel(void* data); @@ -42,6 +42,11 @@ public: static void updateUserInfo(const char *email); + static void onMsgFormFocusRecieved(LLUICtrl* receiver, void* data); + static void missingSubjMsgAlertCallback(S32 option, void* data); + + void sendPostcard(); + protected: LLPointer<LLImageJPEG> mJPEGImage; @@ -50,6 +55,7 @@ protected: LLAssetID mAssetID; LLVector2 mImageScale; LLVector3d mPosTakenGlobal; + boolean mHasFirstMsgFocus; static LLLinkedList<LLFloaterPostcard> sInstances; }; |