diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-19 17:25:02 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-19 17:25:02 -0700 |
| commit | 9b1174243d3a264f296574329a73f945bf7165a7 (patch) | |
| tree | 63c90576481c1052e7aeebc52623290b3f469814 /indra/newview/llprogressview.h | |
| parent | 892ca49503884daf26cff671047409ced4386547 (diff) | |
EXP-932 Implement system that fades from login page to (either) intro screen or loading screen instead of using a hard cut
EXP-938 Turn off in-world audio until fade from intro/loading page complete
EXP-939 Fade from intro/loading page to world, not to image of last login
Diffstat (limited to 'indra/newview/llprogressview.h')
| -rw-r--r-- | indra/newview/llprogressview.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h index 73dd478e98..fac00ad04d 100644 --- a/indra/newview/llprogressview.h +++ b/indra/newview/llprogressview.h @@ -48,6 +48,7 @@ public: BOOL postBuild(); /*virtual*/ void draw(); + void drawStartTexture(F32 alpha); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); @@ -65,6 +66,8 @@ public: // turns on (under certain circumstances) the into video after login void revealIntroPanel(); + void setStartupComplete(); + void setCancelButtonVisible(BOOL b, const std::string& label); static void onCancelButtonClicked( void* ); @@ -82,8 +85,10 @@ protected: std::string mMessage; LLButton* mCancelBtn; LLFrameTimer mFadeToWorldTimer; + LLFrameTimer mFadeFromLoginTimer; LLRect mOutlineRect; bool mMouseDownInActiveArea; + bool mStartupComplete; // The LLEventStream mUpdateEvents depends upon this class being a singleton // to avoid pump name conflicts. |