diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-29 10:42:02 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-29 10:42:02 -0700 |
| commit | 95031093c795f3a97cdc673c7b7807c944742ab8 (patch) | |
| tree | 378e103331e289894bbc915b15772ac844b6ccae /indra/newview/llfloaterchat.h | |
| parent | fb4e95f7ea0a1f6e900f6ee1de73ec02860ff815 (diff) | |
| parent | 15687e2acd07ed3c0a56a61af982595b99dc064f (diff) | |
merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 3824-3835
Diffstat (limited to 'indra/newview/llfloaterchat.h')
| -rw-r--r-- | indra/newview/llfloaterchat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h index 6ba3165d6a..aed82a6781 100644 --- a/indra/newview/llfloaterchat.h +++ b/indra/newview/llfloaterchat.h @@ -78,7 +78,7 @@ public: static void onClickMute(void *data); static void onClickToggleShowMute(LLUICtrl* caller, void *data); static void onClickToggleActiveSpeakers(void* userdata); - static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata); + static void chatFromLogFile(LLLogChat::ELogLineType type, const LLSD& line, void* userdata); static void loadHistory(); static void* createSpeakersPanel(void* data); static void* createChatPanel(void* data); |