From 7ad3be1baac45d3971d1ebae5a13880209bff231 Mon Sep 17 00:00:00 2001 From: Hazim Gazov Date: Tue, 8 Jun 2010 22:39:17 -0300 Subject: [PATCH] convert crlf to lf --- indra/llmessage/llmessagelog.cpp | 114 +++++++++++++++---------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/indra/llmessage/llmessagelog.cpp b/indra/llmessage/llmessagelog.cpp index 378c275b9..5e3da3bbc 100644 --- a/indra/llmessage/llmessagelog.cpp +++ b/indra/llmessage/llmessagelog.cpp @@ -1,57 +1,57 @@ -// -#include "llmessagelog.h" - -LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, U8* data, S32 data_size) -: mType(type), - mFromHost(from_host), - mToHost(to_host), - mDataSize(data_size) -{ - if(data) - { - mData.resize(data_size); - mData.assign(data,data + data_size); - } -} -LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, std::vector data, S32 data_size) -: mType(type), - mFromHost(from_host), - mToHost(to_host), - mDataSize(data_size) -{ - if(data.size()) - { - mData.resize(data.size()); - std::copy(data.begin(),data.end(),mData.begin()); - } -} -LLMessageLogEntry::~LLMessageLogEntry() -{ -} -U32 LLMessageLog::sMaxSize = 4096; // testzone fixme todo boom -std::deque LLMessageLog::sDeque; -void (*(LLMessageLog::sCallback))(LLMessageLogEntry); -void LLMessageLog::setMaxSize(U32 size) -{ - sMaxSize = size; - while(sDeque.size() > sMaxSize) - sDeque.pop_front(); -} -void LLMessageLog::setCallback(void (*callback)(LLMessageLogEntry)) -{ - sCallback = callback; -} -void LLMessageLog::log(LLHost from_host, LLHost to_host, U8* data, S32 data_size) -{ - LLMessageLogEntry entry = LLMessageLogEntry(LLMessageLogEntry::TEMPLATE, from_host, to_host, data, data_size); - if(sCallback) sCallback(entry); - if(!sMaxSize) return; - sDeque.push_back(entry); - if(sDeque.size() > sMaxSize) - sDeque.pop_front(); -} -std::deque LLMessageLog::getDeque() -{ - return sDeque; -} -// +// +#include "llmessagelog.h" + +LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, U8* data, S32 data_size) +: mType(type), + mFromHost(from_host), + mToHost(to_host), + mDataSize(data_size) +{ + if(data) + { + mData.resize(data_size); + mData.assign(data,data + data_size); + } +} +LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, std::vector data, S32 data_size) +: mType(type), + mFromHost(from_host), + mToHost(to_host), + mDataSize(data_size) +{ + if(data.size()) + { + mData.resize(data.size()); + std::copy(data.begin(),data.end(),mData.begin()); + } +} +LLMessageLogEntry::~LLMessageLogEntry() +{ +} +U32 LLMessageLog::sMaxSize = 4096; // testzone fixme todo boom +std::deque LLMessageLog::sDeque; +void (*(LLMessageLog::sCallback))(LLMessageLogEntry); +void LLMessageLog::setMaxSize(U32 size) +{ + sMaxSize = size; + while(sDeque.size() > sMaxSize) + sDeque.pop_front(); +} +void LLMessageLog::setCallback(void (*callback)(LLMessageLogEntry)) +{ + sCallback = callback; +} +void LLMessageLog::log(LLHost from_host, LLHost to_host, U8* data, S32 data_size) +{ + LLMessageLogEntry entry = LLMessageLogEntry(LLMessageLogEntry::TEMPLATE, from_host, to_host, data, data_size); + if(sCallback) sCallback(entry); + if(!sMaxSize) return; + sDeque.push_back(entry); + if(sDeque.size() > sMaxSize) + sDeque.pop_front(); +} +std::deque LLMessageLog::getDeque() +{ + return sDeque; +} +//