diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 12:57:03 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 12:57:03 -0800 |
commit | 705e31f16ad2e9b530bc083db13d29cbc8613f82 (patch) | |
tree | bbf7a443c649f4561e7f70a787b83e6555afe0d0 /indra/newview/llchathistory.h | |
parent | cd5cd11ccbd1ad13afd43c045735f01dbc994a80 (diff) | |
parent | 85c97cab02b0f2ba89b7af05c14a69ff90ffa25e (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llchathistory.h')
-rw-r--r-- | indra/newview/llchathistory.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 260015e2dc..f2d403f639 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -119,6 +119,7 @@ class LLChatHistory : public LLUICtrl */ void appendMessage(const LLChat& chat, const bool use_plain_text_chat_history = false, const LLStyle::Params& input_append_params = LLStyle::Params()); /*virtual*/ void clear(); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); private: std::string mLastFromName; |