summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-11 12:18:35 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-11 12:18:35 -0700
commitb871d67710cc4168752dee976725e190c0cd9960 (patch)
treef6c56ec4da61c6bcb7331ba5d16aa133742e4eb6 /indra/newview/llconversationmodel.h
parent375f380ea388b37c34ace9570822d0c117b3d2f1 (diff)
parent0ff5a0c8ceebfab0d786aaf027c7c548170afe8d (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llconversationmodel.h')
-rwxr-xr-xindra/newview/llconversationmodel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index bc72cd96ea..1d082852f5 100755
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -126,6 +126,8 @@ public:
void resetRefresh() { mNeedsRefresh = false; }
bool needsRefresh() { return mNeedsRefresh; }
+ void postEvent(const std::string& event_type, LLConversationItemSession* session, LLConversationItemParticipant* participant);
+
void buildParticipantMenuOptions(menuentry_vec_t& items);
protected:
@@ -147,6 +149,7 @@ public:
LLPointer<LLUIImage> getIcon() const { return NULL; }
void setSessionID(const LLUUID& session_id) { mUUID = session_id; mNeedsRefresh = true; }
void addParticipant(LLConversationItemParticipant* participant);
+ void updateParticipantName(LLConversationItemParticipant* participant);
void removeParticipant(LLConversationItemParticipant* participant);
void removeParticipant(const LLUUID& participant_id);
void clearParticipants();