diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 08:04:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 08:04:26 +0000 |
| commit | 9e2cb2f4a00a6acc48738f9df788ad5adfc7d62a (patch) | |
| tree | 1a8d50ed5791e6c5fe3239e88c41ce5d6b561e68 /indra/llui/llmodaldialog.h | |
| parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
DEV-38942 Eliminate startModal() from LLModalDialog
Also moved TOS and Critical floaters to login debug menu for testing
Diffstat (limited to 'indra/llui/llmodaldialog.h')
| -rw-r--r-- | indra/llui/llmodaldialog.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llmodaldialog.h b/indra/llui/llmodaldialog.h index 4d5073024b..9d716a1880 100644 --- a/indra/llui/llmodaldialog.h +++ b/indra/llui/llmodaldialog.h @@ -45,18 +45,16 @@ class LLModalDialog; class LLModalDialog : public LLFloater { public: - LLModalDialog( const LLSD& key, S32 width, S32 height, BOOL modal = true ); + LLModalDialog( const LLSD& key, BOOL modal = true ); /*virtual*/ ~LLModalDialog(); /*virtual*/ BOOL postBuild(); /*virtual*/ void openFloater(const LLSD& key = LLSD()); + /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); - /*virtual*/ void startModal(); - /*virtual*/ void stopModal(); - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); @@ -68,7 +66,8 @@ public: /*virtual*/ void setVisible(BOOL visible); /*virtual*/ void draw(); - BOOL isModal() const { return mModal; } + BOOL isModal() const { return mModal; } + void stopModal(); static void onAppFocusLost(); static void onAppFocusGained(); @@ -79,6 +78,7 @@ protected: void centerOnScreen(); private: + LLFrameTimer mVisibleTime; const BOOL mModal; |