summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-12-21 13:03:14 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2009-12-21 13:03:14 -0800
commit2f91768d96683515383570c8aae21bd126fd0ad6 (patch)
tree8c0a34f7e5aa4ae519d3c10e1c6fc8e9b83cb006 /indra/newview/llbottomtray.h
parentd74d0d5c41d5ea114cef19aa7e54834d1c3b554b (diff)
parent0e6f0e5ca16f534ff14c57c77c323bed2d6e730c (diff)
merge.
Diffstat (limited to 'indra/newview/llbottomtray.h')
-rw-r--r--indra/newview/llbottomtray.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 5cd3f15746..9be0e5810f 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -75,8 +75,6 @@ public:
virtual void sessionRemoved(const LLUUID& session_id);
void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
- void onNewIM(const LLSD& data);
-
S32 getTotalUnreadIMCount();
virtual void reshape(S32 width, S32 height, BOOL called_from_parent);