diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/newview/llimpanel.h | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
Diffstat (limited to 'indra/newview/llimpanel.h')
| -rw-r--r-- | indra/newview/llimpanel.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index 28ea002583..cb8042e010 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -105,7 +105,7 @@ private: void setTyping(BOOL typing); // Add the "User is typing..." indicator. - void addTypingIndicator(const LLIMInfo* im_info); + void addTypingIndicator(const std::string &name); // Remove the "User is typing..." indicator. void removeTypingIndicator(); @@ -145,6 +145,9 @@ private: // Is other user currently typing? BOOL mOtherTyping; + // name of other user who is currently typing + std::string mOtherTypingName; + // Where does the "User is typing..." line start? S32 mTypingLineStartIndex; //Where does the "Starting session..." line start? |