diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
| commit | 3d2378f1020060a84ab0b9ae23507077b7a0e7c1 (patch) | |
| tree | 448bc57cf16514ef602602feff45ec4583d18608 /indra/newview/llprogressview.h | |
| parent | f094d4f7529c27233f5ca228bda21deb9b864f1a (diff) | |
| parent | ebb55355ebbe6ec6760d8683e461903957ed24e5 (diff) | |
merge from viewer-pre-release
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. |