summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lleventpoll.cpp23
-rw-r--r--indra/newview/llimfloater.cpp4
-rw-r--r--indra/newview/llimview.cpp7
-rw-r--r--indra/newview/llspeakers.cpp4
-rw-r--r--indra/newview/llvoicechannel.cpp2
5 files changed, 31 insertions, 9 deletions
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index a5aa014a74..27f79dda2c 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -37,6 +37,7 @@
#include "llviewerregion.h"
#include "message.h"
#include "lltrans.h"
+#include "llsdserialize.h"
namespace
{
@@ -134,7 +135,7 @@ namespace
LLViewerRegion *regionp = gAgent.getRegion();
if (!regionp)
{
- llerrs << "LLEventPoll initialized before region is added." << llendl;
+ llinfos << "Merov debug : LLEventPoll initialized before region is added." << llendl;
}
mSender = sender.getIPandPort();
llinfos << "Merov debug : LLEventPoll initialized with sender " << mSender << llendl;
@@ -144,7 +145,7 @@ namespace
LLEventPollResponder::~LLEventPollResponder()
{
stop();
- llinfos << "Merov debug : LLEventPollResponder::~Impl <" << mCount << "> "
+ llinfos << "Merov debug : LLEventPollResponder::~Impl <" << mCount << "> "
<< mPollURL << llendl;
}
@@ -174,7 +175,12 @@ namespace
request["ack"] = mAcknowledge;
request["done"] = mDone;
- llinfos << "Merov debug : LLEventPollResponder::makeRequest <" << mCount << "> ack = " << LLSDXMLStreamer(mAcknowledge) << llendl;
+ llinfos << "Merov debug : viewer->sim : LLEventPollResponder::makeRequest <" << mCount
+ << "> ack = " << LLSDXMLStreamer(mAcknowledge)
+ << ", error = " << mErrorCount
+ << ", sender = " << mSender
+ << ", url = " << mPollURL
+ << ", done = " << mDone << llendl;
LLHTTPClient::post(mPollURL, request, this);
}
@@ -184,13 +190,14 @@ namespace
LLSD message;
message["sender"] = mSender;
message["body"] = content["body"];
- llinfos << "Merov debug : LLEventPollResponder::handleMessage, msg_name = " << msg_name << ", message = " << LLSDOStreamer<LLSDNotationFormatter>(message) << llendl;
+ llinfos << "Merov debug : sim->viewer : LLEventPollResponder::handleMessage, msg_name = " << msg_name << ", message = " << LLSDOStreamer<LLSDNotationFormatter>(message) << llendl;
LLMessageSystem::dispatch(msg_name, message);
}
//virtual
void LLEventPollResponder::error(U32 status, const std::string& reason)
{
+ llinfos << "Merov debug : LLEventPollResponder::error, status = " << status << ", reason = " << reason << llendl;
if (mDone) return;
llinfos << "Merov debug : LLEventPollResponder::error, status = " << status << ", reason = " << reason << llendl;
@@ -214,7 +221,7 @@ namespace
}
else
{
- llinfos << "Merov debug : LLEventPollResponder::error: <" << mCount << "> got "
+ llinfos << "Merov debug : LLEventPollResponder::error: <" << mCount << "> got "
<< status << ": " << reason
<< (mDone ? " -- done" : "") << llendl;
stop();
@@ -239,8 +246,8 @@ namespace
//virtual
void LLEventPollResponder::result(const LLSD& content)
{
- llinfos << "Merov debug : LLEventPollResponder::result <" << mCount << ">"
- << (mDone ? " -- done" : "") << llendl;
+ llinfos << "Merov debug : LLEventPollResponder::result <" << mCount << "> "
+ << (mDone ? " -- done" : "") << ", content = " << LLSDOStreamer<LLSDNotationFormatter>(content) << llendl;
if (mDone) return;
@@ -263,7 +270,7 @@ namespace
}
// was llinfos but now that CoarseRegionUpdate is TCP @ 1/second, it'd be too verbose for viewer logs. -MG
- llinfos << "Merov debug : LLEventPollResponder::completed <" << mCount << "> " << events.size() << "events (id "
+ llinfos << "Merov debug : LLEventPollResponder::completed <" << mCount << "> " << events.size() << "events (id "
<< LLSDXMLStreamer(mAcknowledge) << ")" << llendl;
LLSD::array_const_iterator i = events.beginArray();
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 467f48600a..47e091a57c 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -59,6 +59,7 @@
#include "llviewerchat.h"
#include "llnotificationmanager.h"
#include "llautoreplace.h"
+#include "llsdserialize.h"
floater_showed_signal_t LLIMFloater::sIMFloaterShowedSignal;
@@ -1208,11 +1209,12 @@ BOOL LLIMFloater::inviteToSession(const uuid_vec_t& ids)
}
data["method"] = "invite";
data["session-id"] = mSessionID;
+ llinfos << "Merov debug : viewer->sim : LLIMFloater::inviteToSession, session id = " << mSessionID << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(url, data,new LLSessionInviteResponder(mSessionID));
}
else
{
- llinfos << "LLIMFloater::inviteToSession -"
+ llinfos << "Merov debug : LLIMFloater::inviteToSession -"
<< " no need to invite agents for "
<< mDialog << llendl;
// successful add, because everyone that needed to get added
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index b45903835a..398584e005 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -63,6 +63,7 @@
#include "lltoolbarview.h"
#include "llviewercontrol.h"
#include "llviewerparcelmgr.h"
+#include "llsdserialize.h"
const static std::string ADHOC_NAME_SUFFIX(" Conference");
@@ -1316,6 +1317,7 @@ bool LLIMModel::sendStartSession(
data["params"] = agents;
+ llinfos << "Merov debug : viewer-> sim : LLIMModel::sendStartSession, session id = " << temp_session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(
url,
data,
@@ -2253,6 +2255,7 @@ void LLIncomingCallDialog::processCallResponse(S32 response, const LLSD &payload
LLSD data;
data["method"] = "accept invitation";
data["session-id"] = session_id;
+ llinfos << "Merov debug : viewer-> sim : LLIncomingCallDialog::processCallResponse, accept, session id = " << session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(
url,
data,
@@ -2293,6 +2296,7 @@ void LLIncomingCallDialog::processCallResponse(S32 response, const LLSD &payload
LLSD data;
data["method"] = "decline invitation";
data["session-id"] = session_id;
+ llinfos << "Merov debug : viewer-> sim : LLIncomingCallDialog::processCallResponse, decline, session id = " << session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(
url,
data,
@@ -2346,6 +2350,7 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response)
LLSD data;
data["method"] = "accept invitation";
data["session-id"] = session_id;
+ llinfos << "Merov debug : viewer-> sim : inviteUserResponse, accept, session id = " << session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(
url,
data,
@@ -2381,6 +2386,7 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response)
LLSD data;
data["method"] = "decline invitation";
data["session-id"] = session_id;
+ llinfos << "Merov debug : viewer-> sim : inviteUserResponse, decline, session id = " << session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(
url,
data,
@@ -3345,6 +3351,7 @@ public:
LLSD data;
data["method"] = "accept invitation";
data["session-id"] = session_id;
+ llinfos << "Merov debug : viewer-> sim : LLViewerChatterBoxInvitation, session id = " << session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(
url,
data,
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 92149ee50a..2e26eabb71 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -36,6 +36,7 @@
#include "llviewerobjectlist.h"
#include "llvoavatar.h"
#include "llworld.h"
+#include "llsdserialize.h"
const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f);
const LLColor4 ACTIVE_COLOR(0.5f, 0.5f, 0.5f, 1.f);
@@ -787,6 +788,7 @@ void LLIMSpeakerMgr::toggleAllowTextChat(const LLUUID& speaker_id)
//current value represents ability to type, so invert
data["params"]["mute_info"]["text"] = !speakerp->mModeratorMutedText;
+ llinfos << "Merov debug : viewer->sim : LLIMSpeakerMgr::toggleAllowTextChat, session id = " << getSessionID() << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(url, data, new ModerationResponder(getSessionID()));
}
@@ -811,6 +813,7 @@ void LLIMSpeakerMgr::moderateVoiceParticipant(const LLUUID& avatar_id, bool unmu
data["params"]["mute_info"] = LLSD::emptyMap();
data["params"]["mute_info"]["voice"] = !unmute;
+ llinfos << "Merov debug : viewer->sim : LLIMSpeakerMgr::moderateVoiceParticipant, session id = " << getSessionID() << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(
url,
data,
@@ -853,6 +856,7 @@ void LLIMSpeakerMgr::moderateVoiceSession(const LLUUID& session_id, bool disallo
data["params"]["update_info"]["moderated_mode"] = LLSD::emptyMap();
data["params"]["update_info"]["moderated_mode"]["voice"] = disallow_voice;
+ llinfos << "Merov debug : viewer->sim : LLIMSpeakerMgr::moderateVoiceSession, session id = " << session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(url, data, new ModerationResponder(session_id));
}
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index ceff75a0cc..62a43333dd 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -35,6 +35,7 @@
#include "llrecentpeople.h"
#include "llviewercontrol.h"
#include "llvoicechannel.h"
+#include "llsdserialize.h"
LLVoiceChannel::voice_channel_map_t LLVoiceChannel::sVoiceChannelMap;
@@ -539,6 +540,7 @@ void LLVoiceChannelGroup::getChannelInfo()
LLSD data;
data["method"] = "call";
data["session-id"] = mSessionID;
+ llinfos << "Merov debug : viewer-> sim : LLVoiceChannelGroup::getChannelInfo, session id = " << mSessionID << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl;
LLHTTPClient::post(url,
data,
new LLVoiceCallCapResponder(mSessionID));
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 00:56:04 +0000