diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
commit | 9f4dc3adf413f76346cc2c64392671d3255d629b (patch) | |
tree | 0ca49f2c9abfe11f892d76de95e41fbb1eb390ea /indra/newview/llchannelmanager.h | |
parent | d5bed7df3545f0765e6767c085f64a0a04136e7e (diff) | |
parent | 9cef95ca2bf8a7194c6ce80ba744d9c936695e86 (diff) |
Merge from default branch
--HG--
branch : product-engine
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); |