From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 26 Jun 2008 00:39:00 +0000 Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release dataserver-is-deprecated --- indra/newview/lllogchat.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/lllogchat.h') diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index 0fcee48dfc..45279fd6ae 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -42,11 +42,11 @@ public: LOG_LINE, LOG_END }; - static LLString timestamp(bool withdate = false); - static LLString makeLogFileName(LLString(filename)); - static void saveHistory(LLString filename, LLString line); - static void loadHistory(LLString filename, - void (*callback)(ELogLineType,LLString,void*), + static std::string timestamp(bool withdate = false); + static std::string makeLogFileName(std::string(filename)); + static void saveHistory(std::string filename, std::string line); + static void loadHistory(std::string filename, + void (*callback)(ELogLineType,std::string,void*), void* userdata); }; -- cgit v1.2.3