summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-21 15:20:41 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-21 15:20:41 -0500
commitd215cd5c244a5448668cb2173b1d95d0d6adf3ae (patch)
tree1ca61d7f58f2cfd063167c235431cf3836416db4 /indra/newview/llbottomtray.h
parent37b04c150792bb3e53a5ba02c6631aa1d0f8686f (diff)
parentc72de2edf0a2f7590fd43d86c59e83afcf7e8bcf (diff)
automated merge PE->viewer2.0
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);