diff options
author | Yuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com> | 2009-10-27 11:28:46 +0200 |
---|---|---|
committer | Yuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com> | 2009-10-27 11:28:46 +0200 |
commit | 62c8f55e3e49f55bc76dbcaba797ca02b3072c3f (patch) | |
tree | e514e155cae5f3fb0939aea9d58bab43d4a05af0 /indra/newview/llchathistory.h | |
parent | e4b3b5f7df55df49f1253cf5fa7bd728e1fbb094 (diff) |
working on EXT-1713,EXT-1712,EXT-1711,EXT-1709
EXT-1713 Nearby Chat: Objects have tooltips (???)(???)
EXT-1712 Nearby Chat: change context menu for objects
EXT-1711 Nearby Chat: context menu isn't applicable for system messages
EXT-1709 Nearby Chat: Avatar context menu can be triggered on avatar's icon only
initial commit - panel for message headers
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llchathistory.h')
-rw-r--r-- | indra/newview/llchathistory.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index d6eccf896a..f13e974a9c 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -34,6 +34,7 @@ #define LLCHATHISTORY_H_ #include "lltexteditor.h" +#include "llchat.h" //Chat log widget allowing addition of a message as a widget class LLChatHistory : public LLTextEditor @@ -85,7 +86,7 @@ class LLChatHistory : public LLTextEditor * @param time time of a message. * @return pointer to LLView header object. */ - LLView* getHeader(const LLUUID& avatar_id, std::string& from, std::string& time); + LLView* getHeader(const LLChat& chat); public: ~LLChatHistory(); @@ -94,11 +95,11 @@ class LLChatHistory : public LLTextEditor * Appends a widget message. * If last user appended message, concurs with current user, * separator is added before the message, otherwise header is added. - * @param from owner of a message. + * @param chat - base chat message. * @param time time of a message. * @param message message itself. */ - void appendWidgetMessage(const LLUUID& avatar_id, std::string& from, std::string& time, std::string& message, LLStyle::Params& style_params); + void appendWidgetMessage(const LLChat& chat, LLStyle::Params& style_params); private: std::string mLastFromName; |