diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-15 14:29:46 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-15 14:29:46 -0500 |
| commit | 99dc246ac843114f20f7aa99531451fcf46df3ed (patch) | |
| tree | d94a0a31e00c53ea359d9939d1928180d398b334 /indra/newview/llprogressview.h | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
| parent | d76715776bb9e26577c4e505745eb2773e8a4796 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llprogressview.h')
| -rw-r--r-- | indra/newview/llprogressview.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h index fac00ad04d..813576b21d 100644 --- a/indra/newview/llprogressview.h +++ b/indra/newview/llprogressview.h @@ -41,6 +41,8 @@ class LLProgressView : public LLViewerMediaObserver { + LOG_CLASS(LLProgressView); + public: LLProgressView(); virtual ~LLProgressView(); @@ -74,10 +76,6 @@ public: static void onClickMessage(void*); bool onAlertModal(const LLSD& sd); - // note - this is not just hiding the intro panel - it also hides the parent panel - // and is used when the intro is finished and we want to show the world - void removeIntroPanel(); - protected: LLProgressBar* mProgressBar; LLMediaCtrl* mMediaCtrl; @@ -96,6 +94,7 @@ protected: LLEventStream mUpdateEvents; bool handleUpdate(const LLSD& event_data); + static void onIdle(void* user_data); }; #endif // LL_LLPROGRESSVIEW_H |