MAINT-1551 : WIP : More IM comm tracing and attempt to fix

3 files changed, 28 insertions, 16 deletions

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 3326103d03..f7f5c04ef9 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -296,10 +296,17 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids, const LLUUID& float
 	}
 	const std::string title = LLTrans::getString("conference-title");
 	LLUUID session_id = gIMMgr->addSession(title, IM_SESSION_CONFERENCE_START, ids[0], id_array, false, floater_id);
-	if (session_id != LLUUID::null)
+
+	if (session_id == LLUUID::null)
 	{
-		LLIMFloater::show(session_id);
+		return;
 	}
+	
+	LLIMFloater::show(session_id);
+//	gIMMgr->processAgentListUpdates(session_id, LLSD());
+	gIMMgr->startCall(session_id,LLVoiceChannel::OUTGOING_CALL);
+	gIMMgr->endCall(session_id);
+	
 	make_ui_sound("UISndStartIM");
 }
 
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index 4f4d9a40b4..a5aa014a74 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -109,14 +109,14 @@ namespace
 		const std::string& pollURL, const LLHost& sender)
 	{
 		LLHTTPClient::ResponderPtr result = new LLEventPollResponder(pollURL, sender);
-		llinfos	<< "LLEventPollResponder::start <" << sCount << "> "
+		llinfos	<< "Merov debug : LLEventPollResponder::start <" << sCount << "> "
 				<< pollURL << llendl;
 		return result;
 	}
 
 	void LLEventPollResponder::stop()
 	{
-		llinfos	<< "LLEventPollResponder::stop	<" << mCount <<	"> "
+		llinfos	<< "Merov debug : LLEventPollResponder::stop	<" << mCount <<	"> "
 				<< mPollURL	<< llendl;
 		// there should	be a way to	stop a LLHTTPClient	request	in progress
 		mDone =	true;
@@ -137,14 +137,14 @@ namespace
 			llerrs << "LLEventPoll initialized before region is added." << llendl;
 		}
 		mSender = sender.getIPandPort();
-		llinfos << "LLEventPoll initialized with sender " << mSender << llendl;
+		llinfos << "Merov debug : LLEventPoll initialized with sender " << mSender << llendl;
 		makeRequest();
 	}
 
 	LLEventPollResponder::~LLEventPollResponder()
 	{
 		stop();
-		lldebugs <<	"LLEventPollResponder::~Impl <" <<	mCount << "> "
+		llinfos << "Merov debug : LLEventPollResponder::~Impl <" <<	mCount << "> "
 				 <<	mPollURL <<	llendl;
 	}
 
@@ -154,11 +154,13 @@ namespace
 									const LLChannelDescriptors& channels,
 									const LLIOPipe::buffer_ptr_t& buffer)
 	{
+		llinfos << "Merov debug : LLEventPollResponder::completedRaw url <" << mPollURL << ">, status = " <<	status << ", reason = " <<	reason <<	llendl;
 		if (status == HTTP_BAD_GATEWAY)
 		{
 			// These errors are not parsable as LLSD, 
 			// which LLHTTPClient::Responder::completedRaw will try to do.
-			completed(status, reason, LLSD());
+			//completed(status, reason, LLSD());
+			error(status, reason);
 		}
 		else
 		{
@@ -172,8 +174,7 @@ namespace
 		request["ack"] = mAcknowledge;
 		request["done"]	= mDone;
 		
-		lldebugs <<	"LLEventPollResponder::makeRequest	<" << mCount <<	"> ack = "
-				 <<	LLSDXMLStreamer(mAcknowledge) << llendl;
+		llinfos << "Merov debug : LLEventPollResponder::makeRequest	<" << mCount <<	"> ack = " <<	LLSDXMLStreamer(mAcknowledge) << llendl;
 		LLHTTPClient::post(mPollURL, request, this);
 	}
 
@@ -183,6 +184,7 @@ namespace
 		LLSD message;
 		message["sender"] = mSender;
 		message["body"] = content["body"];
+		llinfos << "Merov debug : LLEventPollResponder::handleMessage, msg_name = " << msg_name << ", message = " << LLSDOStreamer<LLSDNotationFormatter>(message) << llendl;
 		LLMessageSystem::dispatch(msg_name, message);
 	}
 
@@ -190,6 +192,7 @@ namespace
 	void LLEventPollResponder::error(U32 status, const	std::string& reason)
 	{
 		if (mDone) return;
+		llinfos << "Merov debug : LLEventPollResponder::error, status = " << status << ", reason = " << reason << llendl;
 
 		// A HTTP_BAD_GATEWAY (502) error is our standard timeout response
 		// we get this when there are no events.
@@ -207,11 +210,11 @@ namespace
 										+ mErrorCount * EVENT_POLL_ERROR_RETRY_SECONDS_INC
 									, this);
 
-			llwarns << "Unexpected HTTP error.  status: " << status << ", reason: " << reason << llendl;
+			llinfos << "Merov debug : Unexpected HTTP error.  status: " << status << ", reason: " << reason << llendl;
 		}
 		else
 		{
-			llwarns <<	"LLEventPollResponder::error: <" << mCount << "> got "
+			llinfos << "Merov debug : LLEventPollResponder::error: <" << mCount << "> got "
 					<<	status << ": " << reason
 					<<	(mDone ? " -- done"	: "") << llendl;
 			stop();
@@ -227,7 +230,7 @@ namespace
 			// continue running.
 			if(gAgent.getRegion() && gAgent.getRegion()->getHost().getIPandPort() == mSender)
 			{
-				llwarns << "Forcing disconnect due to stalled main region event poll."  << llendl;
+				llinfos << "Merov debug : Forcing disconnect due to stalled main region event poll."  << llendl;
 				LLAppViewer::instance()->forceDisconnect(LLTrans::getString("AgentLostConnection"));
 			}
 		}
@@ -236,7 +239,7 @@ namespace
 	//virtual
 	void LLEventPollResponder::result(const LLSD& content)
 	{
-		lldebugs <<	"LLEventPollResponder::result <" << mCount	<< ">"
+		llinfos << "Merov debug : LLEventPollResponder::result <" << mCount	<< ">"
 				 <<	(mDone ? " -- done"	: "") << llendl;
 		
 		if (mDone) return;
@@ -246,7 +249,7 @@ namespace
 		if (!content.get("events") ||
 			!content.get("id"))
 		{
-			llwarns << "received event poll with no events or id key" << llendl;
+			llinfos << "Merov debug : received event poll with no events or id key" << llendl;
 			makeRequest();
 			return;
 		}
@@ -256,11 +259,11 @@ namespace
 
 		if(mAcknowledge.isUndefined())
 		{
-			llwarns << "LLEventPollResponder: id undefined" << llendl;
+			llinfos << "Merov debug : LLEventPollResponder: id undefined" << llendl;
 		}
 		
 		// was llinfos but now that CoarseRegionUpdate is TCP @ 1/second, it'd be too verbose for viewer logs. -MG
-		lldebugs  << "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/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 2d2b5202e0..92149ee50a 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -286,6 +286,7 @@ LLPointer<LLSpeaker> LLSpeakerMgr::setSpeaker(const LLUUID& id, const std::strin
 		mSpeakers.insert(std::make_pair(speakerp->mID, speakerp));
 		mSpeakersSorted.push_back(speakerp);
 		LL_DEBUGS("Speakers") << "Added speaker " << id << llendl;
+		//llinfos << "Merov debug : setSpeaker, add, id = " << id << ", name = " << name << llendl;
 		fireEvent(new LLSpeakerListChangeEvent(this, speakerp->mID), "add");
 	}
 	else
@@ -306,6 +307,7 @@ LLPointer<LLSpeaker> LLSpeakerMgr::setSpeaker(const LLUUID& id, const std::strin
 		}
 		else
 		{
+			llinfos << "Merov debug : setSpeaker, speaker not found? id = " << id << ", name = " << name << llendl;
 			LL_WARNS("Speakers") << "Speaker " << id << " not found" << llendl;
 		}
 	}