diff options
author | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
commit | 0080ed8e2914fba475b224344d8e4233e8fa48e2 (patch) | |
tree | c316dd991d5b54a19594639686215230a89736b4 /indra/newview/llchathistory.h | |
parent | 0b44850c6f1057cd095ed9fe68f9285e546c662e (diff) | |
parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) |
Merge
Diffstat (limited to 'indra/newview/llchathistory.h')
-rw-r--r-- | indra/newview/llchathistory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index ac48d7bf29..28344e6a10 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -94,7 +94,7 @@ class LLChatHistory : public LLUICtrl * Builds a message header. * @return pointer to LLView header object. */ - LLView* getHeader(const LLChat& chat,const LLStyle::Params& style_params); + LLView* getHeader(const LLChat& chat,const LLStyle::Params& style_params, const LLSD& args); void onClickMoreText(); |