summaryrefslogtreecommitdiff
path: root/indra/newview/llsyswellwindow.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-18 10:50:29 -0800
committerJames Cook <james@lindenlab.com>2009-12-18 10:50:29 -0800
commiteb501f3231aacb2fd97d8428bb2d25b818b26263 (patch)
tree85a58ed7942c2b96b3e03c9e4dbd8237423e7696 /indra/newview/llsyswellwindow.h
parentb0fd284fbf72ef3a38ea64a61f8d5fe3e2e314b7 (diff)
parentad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff)
Merge, pulling in viewer-2-0
Diffstat (limited to 'indra/newview/llsyswellwindow.h')
-rw-r--r--indra/newview/llsyswellwindow.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index fea145a17e..736b1b9fb4 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -188,9 +188,14 @@ public:
/*virtual*/ void sessionRemoved(const LLUUID& session_id);
/*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
+ void onNewIM(const LLSD& data);
+
void addObjectRow(const LLUUID& object_id, bool new_message = false);
void removeObjectRow(const LLUUID& object_id);
+ void addIMRow(const LLUUID& session_id);
+ bool hasIMRow(const LLUUID& session_id);
+
protected:
/*virtual*/ const std::string& getAnchorViewName() { return IM_WELL_ANCHOR_NAME; }