diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 08:56:49 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 08:56:49 -0700 |
| commit | 6098fd2ebcd1bd78a8f8c638f707e8a14033df9b (patch) | |
| tree | 9e296f4096ee670237e9545ee0e9c083c6ad5dbd /indra/newview/llchannelmanager.h | |
| parent | f1a1f613cf035d9c8e15c03bac7b00972eb3bb66 (diff) | |
| parent | 5fd6887477b61e10ffd29086b9330a54b3a571d2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/brad/viewer-dev
Diffstat (limited to 'indra/newview/llchannelmanager.h')
| -rw-r--r-- | indra/newview/llchannelmanager.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h index 8c725f2660..2d6aa181c5 100644 --- a/indra/newview/llchannelmanager.h +++ b/indra/newview/llchannelmanager.h @@ -119,6 +119,7 @@ public: */ static LLNotificationsUI::LLScreenChannel* getNotificationScreenChannel(); + std::vector<ChannelElem>& getChannelList() { return mChannelList;} private: LLScreenChannel* createChannel(LLChannelManager::Params& p); |