diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 20:47:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 20:47:27 +0000 |
| commit | af98aad98d43ec8b128ecac3089426d6ae6edc3f (patch) | |
| tree | 5971f87afc04580df470a003793dcc8c974e29a7 /indra/newview/llchannelmanager.h | |
| parent | 6a364e6f32c12c1ab2c0f33e8ef07d885a8765a2 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
Diffstat (limited to 'indra/newview/llchannelmanager.h')
| -rw-r--r-- | indra/newview/llchannelmanager.h | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h index dbd2e0b422..e26c96b62e 100644 --- a/indra/newview/llchannelmanager.h +++ b/indra/newview/llchannelmanager.h @@ -44,9 +44,6 @@ namespace LLNotificationsUI { - -#define STARTUP_CHANNEL_ID "AEED3193-8709-4693-8558-7452CCA97AE5" - /** * Manager for screen channels. * Responsible for instantiating and retrieving screen channels. @@ -56,19 +53,16 @@ class LLChannelManager : public LLUICtrl, public LLSingleton<LLChannelManager> public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<LLUUID> id; - Optional<LLChiclet*> chiclet; - Optional<S32> channel_right_bound; - Optional<S32> channel_width; - Optional<bool> display_toasts_always; - Optional<EToastAlignment> align; - - Params(): id("id", LLUUID("")), - chiclet("chiclet", NULL), - channel_right_bound("channel_right_bound", 0), - channel_width("channel_width", 0), - display_toasts_always("display_toasts_always", false), - align("align", NA_BOTTOM) + LLUUID id; + LLChiclet* chiclet; + S32 channel_right_bound; + S32 channel_width; + bool display_toasts_always; + EToastAlignment align; + + Params(): id(LLUUID("")), chiclet(NULL), + channel_right_bound(0), channel_width(0), + display_toasts_always(false), align(NA_BOTTOM) {} }; @@ -104,7 +98,8 @@ public: // On LoginCompleted - show StartUp toast void onLoginCompleted(); - void removeStartUpChannel(); + // removes a channel intended for the startup toast and allows other channels to show their toasts + void onStartUpToastClose(); //TODO: make protected? in order to be shure that channels are created only by notification handlers LLScreenChannel* createChannel(LLChannelManager::Params& p); @@ -112,9 +107,11 @@ public: LLScreenChannel* getChannelByID(const LLUUID id); LLScreenChannel* getChannelByChiclet(const LLChiclet* chiclet); - void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + // remove channel methods + void removeChannelByID(const LLUUID id); + void removeChannelByChiclet(const LLChiclet* chiclet); - LLScreenChannel* getStartUpChannel(); + void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); private: |