summaryrefslogtreecommitdiff
path: root/indra/newview/llprogressview.h
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-12-21 13:48:46 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2009-12-21 13:48:46 -0800
commit87f64b2d8deeeb415bf765268d35b0c0af76b61d (patch)
treeefa9934bb7afbc65292c37185651b8b7f362d593 /indra/newview/llprogressview.h
parentad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff)
EXT-3550 Fixed messages from login.cgi not being displayed.
Handling message from "indeterminate" state - feeding them to the llprogressview. Handling showing error message from incomplete login.
Diffstat (limited to 'indra/newview/llprogressview.h')
-rw-r--r--indra/newview/llprogressview.h6
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