diff options
author | James Cook <james@lindenlab.com> | 2009-12-18 10:50:29 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-18 10:50:29 -0800 |
commit | eb501f3231aacb2fd97d8428bb2d25b818b26263 (patch) | |
tree | 85a58ed7942c2b96b3e03c9e4dbd8237423e7696 /indra/newview/llbottomtray.cpp | |
parent | b0fd284fbf72ef3a38ea64a61f8d5fe3e2e314b7 (diff) | |
parent | ad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff) |
Merge, pulling in viewer-2-0
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-rw-r--r-- | indra/newview/llbottomtray.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 8389895479..6f2e666cc7 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -215,6 +215,10 @@ void LLBottomTray::onNewIM(const LLSD& data) } } +S32 LLBottomTray::getTotalUnreadIMCount() +{ + return getChicletPanel()->getTotalUnreadIMCount(); +} // virtual void LLBottomTray::onChange(EStatusType status, const std::string &channelURI, bool proximal) |