diff options
author | Merov Linden <merov@lindenlab.com> | 2012-10-17 17:45:29 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-10-17 17:45:29 -0700 |
commit | 1cd3c8408fb485792cf20a73156b0fd43f0d90cc (patch) | |
tree | 5086d0d57375da8af1999101c1dad7dcb57bcef3 /indra/newview | |
parent | 1006e2fd259d5f8136ca933eba8d57c8a980bf31 (diff) |
CHUI-422 : Clean up of leftover traces and tests
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llimfloater.cpp | 4 | ||||
-rw-r--r-- | indra/newview/llimview.cpp | 9 | ||||
-rw-r--r-- | indra/newview/llvoicechannel.cpp | 1 |
3 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 47e091a57c..467f48600a 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -59,7 +59,6 @@ #include "llviewerchat.h" #include "llnotificationmanager.h" #include "llautoreplace.h" -#include "llsdserialize.h" floater_showed_signal_t LLIMFloater::sIMFloaterShowedSignal; @@ -1209,12 +1208,11 @@ 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 << "Merov debug : LLIMFloater::inviteToSession -" + llinfos << "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 b5f22731f1..b45903835a 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -63,7 +63,6 @@ #include "lltoolbarview.h" #include "llviewercontrol.h" #include "llviewerparcelmgr.h" -#include "llsdserialize.h" const static std::string ADHOC_NAME_SUFFIX(" Conference"); @@ -1300,7 +1299,6 @@ bool LLIMModel::sendStartSession( else if ( dialog == IM_SESSION_CONFERENCE_START ) { LLSD agents; - agents.append(gAgent.getID()); for (int i = 0; i < (S32) ids.size(); i++) { agents.append(ids[i]); @@ -1318,8 +1316,6 @@ bool LLIMModel::sendStartSession( data["params"] = agents; - llinfos << "Merov debug : viewer-> sim : LLIMModel::sendStartSession, session id = " << temp_session_id << ", data = " << LLSDOStreamer<LLSDNotationFormatter>(data) << llendl; - llinfos << "Merov debug : Extra info for LLIMModel::sendStartSession, other_participant_id = " << other_participant_id << ", agent id = " << gAgent.getID() << llendl; LLHTTPClient::post( url, data, @@ -2257,7 +2253,6 @@ 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, @@ -2298,7 +2293,6 @@ 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, @@ -2352,7 +2346,6 @@ 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, @@ -2388,7 +2381,6 @@ 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, @@ -3353,7 +3345,6 @@ 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/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 62a43333dd..38f9bbc67f 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -540,7 +540,6 @@ 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)); |