diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:55:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:55:05 +0100 |
| commit | b9ea8cc0b53d6a352e0bda8f45dc46ae6d7fc71c (patch) | |
| tree | 5890b12ec39e4256941f26d533c760299b976202 /indra/newview/llfloatersnapshot.h | |
| parent | 23b395b91dd10c6fd11c38d7556340ec26987abd (diff) | |
| parent | 9fd6bab430a1b79b3c2ff307839e756fa4bb82eb (diff) | |
final(?) merge to revert snapshot floater to 2.0.1 level.
Diffstat (limited to 'indra/newview/llfloatersnapshot.h')
| -rw-r--r-- | indra/newview/llfloatersnapshot.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h index f212352cfc..1333497bd2 100644 --- a/indra/newview/llfloatersnapshot.h +++ b/indra/newview/llfloatersnapshot.h @@ -34,10 +34,9 @@ #define LL_LLFLOATERSNAPSHOT_H #include "llfloater.h" -#include "lltransientdockablefloater.h" -class LLFloaterSnapshot : public LLTransientDockableFloater +class LLFloaterSnapshot : public LLFloater { public: typedef enum e_snapshot_format @@ -46,13 +45,6 @@ public: SNAPSHOT_FORMAT_JPEG, SNAPSHOT_FORMAT_BMP } ESnapshotFormat; -
- enum ESnapshotMode
- {
- SNAPSHOT_SHARE,
- SNAPSHOT_SAVE,
- SNAPSHOT_MAIN
- }; LLFloaterSnapshot(const LLSD& key); virtual ~LLFloaterSnapshot(); @@ -64,8 +56,6 @@ public: static void update(); - bool updateButtons(ESnapshotMode mode); - static S32 getUIWinHeightLong() {return sUIWinHeightLong ;} static S32 getUIWinHeightShort() {return sUIWinHeightShort ;} static S32 getUIWinWidth() {return sUIWinWidth ;} @@ -77,8 +67,6 @@ private: static S32 sUIWinHeightLong ; static S32 sUIWinHeightShort ; static S32 sUIWinWidth ; - - LLRect mRefreshBtnRect; }; class LLSnapshotFloaterView : public LLFloaterView |