diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-20 21:39:16 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-20 21:39:16 +0000 |
| commit | f62821fadd50333c367dc5c8de2929273842f9b0 (patch) | |
| tree | df81510047aad699cc97a41c1d86340c7333669b /indra/newview/lllogchat.cpp | |
| parent | 64530c24c85b0c3f177c07ee5342d08b8822adc6 (diff) | |
| parent | a8e9f7ab5010bd4f9d80fbd0002a16bcb802716c (diff) | |
conflict resolved.
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 3650b43364..16b13d9218 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -100,10 +100,10 @@ const static int IDX_TEXT = 3; using namespace boost::posix_time; using namespace boost::gregorian; -class LLLogChatTimeScaner: public LLSingleton<LLLogChatTimeScaner> +class LLLogChatTimeScanner: public LLSingleton<LLLogChatTimeScanner> { public: - LLLogChatTimeScaner() + LLLogChatTimeScanner() { // Note, date/time facets will be destroyed by string streams mDateStream.imbue(std::locale(mDateStream.getloc(), new date_input_facet(DATE_FORMAT))); @@ -464,7 +464,7 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im) boost::trim(timestamp); timestamp.erase(0, 1); timestamp.erase(timestamp.length()-1, 1); - LLLogChatTimeScaner::instance().checkAndCutOffDate(timestamp); + LLLogChatTimeScanner::instance().checkAndCutOffDate(timestamp); im[IM_TIME] = timestamp; } else |