diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-21 17:56:19 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-21 17:56:19 -0500 |
| commit | 6cf7cd95ab9fa9b0fdcc30e86a7d768886500eee (patch) | |
| tree | f21b91acc02092942135349010e0a434cc202523 /indra/newview/llprogressview.h | |
| parent | 97031cb90dce6ed8468e427abc09c99b290ee08d (diff) | |
| parent | 65dfc746888f44309efaacf439057ba30e713e06 (diff) | |
merge
Diffstat (limited to 'indra/newview/llprogressview.h')
| -rw-r--r-- | indra/newview/llprogressview.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h index 865646c85d..6853674d88 100644 --- a/indra/newview/llprogressview.h +++ b/indra/newview/llprogressview.h @@ -35,6 +35,7 @@ #include "llpanel.h" #include "llframetimer.h" +#include "llevents.h" class LLImageRaw; class LLButton; @@ -75,7 +76,12 @@ protected: LLRect mOutlineRect; bool mMouseDownInActiveArea; + // The LLEventStream mUpdateEvents depends upon this class being a singleton + // to avoid pump name conflicts. static LLProgressView* sInstance; + LLEventStream mUpdateEvents; + + bool handleUpdate(const LLSD& event_data); }; #endif // LL_LLPROGRESSVIEW_H |