diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-15 12:34:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-15 12:34:41 -0400 |
| commit | 93620a1dc88ba3f5096edb4e688561b6dcfa0e7e (patch) | |
| tree | cb72a2eb11ba9bcb7d8aab905a8027e38fc4c00f /indra/newview/llchathistory.h | |
| parent | f619dd95d1e33a4c11c2b9491f28a66881626ecc (diff) | |
| parent | 6faa6236f520fd1dbbbbe030957a6354f5c45db3 (diff) | |
merge changes for storm-1078
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(); |