diff options
| author | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
| commit | 22e29b1a856343a13ca5c3f015226cf6544fd9e8 (patch) | |
| tree | 78b4dc789106678ebb1643f49a5d090e323db05a /indra/newview/llfloaterchat.h | |
| parent | a74e12d26b645063c4373c8354667423dec2d3f0 (diff) | |
| parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) | |
merge
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); |