Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed outbound message logger, moved the logging function to llpacketring instead of llnet

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-12 18:46:37 -03:00
parent b52db1ee99
commit 52486129ae
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llmessage/llpacketring.cpp
View File

@@ -50,6 +50,11 @@
#include <netinet/in.h>
#endif
//<edit>
#include "llmessagelog.h"
#include "message.h"
//</edit>
///////////////////////////////////////////////////////////
LLPacketRing::LLPacketRing () :
@@ -273,7 +278,11 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LLHost host)
{
//<edit>
LLMessageLog::log(LLHost("127.0.0.1", gMessageSystem->getListenPort()), host, (U8*)send_buffer, buf_size);
//</edit>
BOOL status = TRUE;
if (!mUseOutThrottle)
{
return doSendPacket(h_socket, send_buffer, buf_size, host );

12
indra/llmessage/net.cpp
View File

@@ -55,11 +55,6 @@
#include "llhost.h"
#include "lltimer.h"
#include "indra_constants.h"
// <edit>
#include "llmessagelog.h"
#include "message.h"
// </edit>
#include "llsocks5.h"
@@ -426,9 +421,6 @@ S32 receive_packet(int hSocket, char * receiveBuffer)
// Returns TRUE on success.
BOOL send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, int nPort)
{
// <edit>
LLMessageLog::log(LLHost("127.0.0.1", 0), LLHost(recipient, nPort), (U8*)sendBuffer, size);
// </edit>
// Sends a packet to the address set in initNet
//
@@ -760,10 +752,6 @@ int receive_packet(int hSocket, char * receiveBuffer)
BOOL send_packet(int hSocket, const char * sendBuffer, int size, U32 recipient, int nPort)
{
// <edit>
LLMessageLog::log(LLHost("127.0.0.1", 0), LLHost(recipient, nPort), (U8*)sendBuffer, size);
// </edit>
int ret;
BOOL success;
BOOL resend;

11
indra/newview/llfloatermessagelog.cpp
View File

@@ -441,13 +441,8 @@ BOOL LLMessageLogFilterApply::tick()
LLFloaterMessageLog::sInstance->stopApplyingFilter();
return TRUE;
}
try
{
LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*mIter)));
} catch (char *str)
{
llwarns << "DERPADERP" << llendl;
}
LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*mIter)));
mIter++;
mProgress++;
}
@@ -688,7 +683,7 @@ void LLFloaterMessageLog::onLog(LLMessageLogEntry entry)
}
// static
void LLFloaterMessageLog::conditionalLog(LLFloaterMessageLogItem item)
{
{
if(!sBusyApplyingFilter)
sInstance->childSetText("log_status_text", llformat("Showing %d messages from %d", sFloaterMessageLogItems.size(), sMessageLogEntries.size()));
std::string find_name = item.mName;