diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-12-21 14:27:47 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-12-21 14:27:47 -0800 |
| commit | b5ed2038fbbf591cb743c4e18e8c5dfcfbea074e (patch) | |
| tree | bb811ea463d158913b772d955816bcfc9ca98902 /indra/newview/llprogressview.h | |
| parent | a32f857fe68f6b191f8029b1a5b137aaa364395b (diff) | |
| parent | e6349ac1927cb311c714e37c710c069b6de67a0b (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
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 |