diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-12 16:08:31 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-12 16:08:31 -0700 |
| commit | e3ecffc180ae50a0e8b726a061ec39cbe591326e (patch) | |
| tree | 3501d25df3c89517988251557e34a9fc268287f1 /indra/newview/llimview.h | |
| parent | 88e33d00cd189aec6ef9b5aa481d4d9a2777b1fb (diff) | |
| parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) | |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 4ce94773bf..f7a4406f00 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -84,6 +84,7 @@ public: /** @deprecated */ static void chatFromLogFile(LLLogChat::ELogLineType type, const LLSD& msg, void* userdata); + bool isOutgoingAdHoc(); bool isAdHoc(); bool isP2P(); bool isOtherParticipantAvaline(); @@ -230,7 +231,7 @@ public: * For an incoming ad-hoc chat - is received from the server and is in a from of "<Avatar's name> Conference" * It is updated in LLIMModel::LLIMSession's constructor to localize the "Conference". */ - const std::string& getName(const LLUUID& session_id) const; + const std::string getName(const LLUUID& session_id) const; /** * Get number of unread messages in a session with session_id @@ -273,6 +274,9 @@ public: static void sendMessage(const std::string& utf8_text, const LLUUID& im_session_id, const LLUUID& other_participant_id, EInstantMessage dialog); + // Adds people from speakers list (people with whom you are currently speaking) to the Recent People List + static void addSpeakersToRecent(const LLUUID& im_session_id); + void testMessages(); /** |