From e2cc2d600bb36ff24f4e6ce8b23b96a1a2a8f158 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 8 Apr 2019 15:18:10 -0500
Subject: [PATCH] Update event poll to work with expected server changes.
 Timeout now behaves like status 502 (which is being removed by LL). Keeping
 502 handling as well to maintain opensim support.

---
 indra/newview/lleventpoll.cpp | 13 +++++++++----
 indra/newview/llselectmgr.cpp |  1 -
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index b804b81be..b1a412b49 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -183,10 +183,15 @@ namespace
 	{
 		if (mDone) return;
 
-		// A HTTP_BAD_GATEWAY (502) error is our standard timeout response
-		// we get this when there are no events.
-		if ( mStatus == HTTP_BAD_GATEWAY )	
-		{
+		// Timeout
+		if (is_internal_http_error_that_warrants_a_retry(mStatus))
+		{ // A standard timeout response we get this when there are no events.
+			mErrorCount = 0;
+			makeRequest();
+		}
+		else if ( mStatus == HTTP_BAD_GATEWAY )
+		{ // LEGACY: A HTTP_BAD_GATEWAY (502) error is our standard timeout response
+		  // we get this when there are no events.
 			mErrorCount = 0;
 			makeRequest();
 		}
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 6fa3882ea..994f3cd66 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6850,7 +6850,6 @@ void LLSelectMgr::pauseAssociatedAvatars()
 			}
 			else
 			{
-				object->print();
 				// Is a regular attachment. Pause the avatar it's attached to.
 				LLVOAvatar* avatar = object->getAvatar();
 				if (avatar)