summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.h
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-12-16 15:30:33 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-12-16 15:30:33 +0200
commit9dd2b290318f657b3dca81278f597cc702a6e149 (patch)
tree12fca0ae49b009cf0532e8fdaa7ffb4dcd9c1742 /indra/newview/llbottomtray.h
parent734f37816ef35089bc0f5710dc1f9684bc5b9b69 (diff)
fixed EXT-2884 Initiation of a voice call should not bring text chat (p2p, ad-hoc, group)
Added flag to an LLIMSession which indicated whether it has been created for a voice call. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.h')
-rw-r--r--indra/newview/llbottomtray.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index fa204ee9ea..1adea24ee4 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -75,6 +75,8 @@ 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);
+
virtual void reshape(S32 width, S32 height, BOOL called_from_parent);
virtual void onFocusLost();