diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-01 09:30:48 -0700 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-01 09:30:48 -0700 |
commit | 55176768998fab1a6b9b5b25910d9d7fa8a16298 (patch) | |
tree | 56dcfedd83aa2911a1c5aadb38820dafaca55111 /indra/newview/llchannelmanager.h | |
parent | 8d6fec5cc10f11a7de0c749ca700d6d1b5a4099a (diff) | |
parent | a94223b3dfb7e2a12e6ab850aac096f1d8301ad3 (diff) |
Merge from viewer-release
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); |