Widen login/teleport progress bar. Fixed toolbar/overlaybar appearing over login progressview. Updated progressview a bit. Added drawcontext alpha support to llprogressbar. Fixed issue with prim media control panel blocking mouseclicks on upper portion of on-prim media.

This commit is contained in:
Shyotl
2013-06-25 10:29:48 -05:00
parent 67df523f10
commit e011517849
9 changed files with 137 additions and 65 deletions

View File

@@ -49,6 +49,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);
@@ -60,6 +61,10 @@ public:
// Set it to NULL when you want to eliminate the message.
void setMessage(const std::string& msg);
void revealIntroPanel();
void setStartupComplete();
void setCancelButtonVisible(BOOL b, const std::string& label);
static void onCancelButtonClicked();
@@ -70,13 +75,14 @@ protected:
F32 mPercentDone;
std::string mMessage;
LLButton* mCancelBtn;
LLFrameTimer mFadeTimer;
LLFrameTimer mProgressTimer;
LLFrameTimer mFadeToWorldTimer;
LLFrameTimer mFadeFromLoginTimer;
LLRect mOutlineRect;
bool mMouseDownInActiveArea;
bool mStartupComplete;
bool mURLInMessage;
static LLProgressView* sInstance;
static void onIdle(void* user_data);
};
#endif // LL_LLPROGRESSVIEW_H