From d2e38538474a175d4532062dc611ef4a70b96aae Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 7 May 2018 22:17:20 +0300 Subject: MAINT-7626 fix merge conflict --- indra/llmessage/llxfermanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmessage') diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp index 70def36d51..f157f4be56 100644 --- a/indra/llmessage/llxfermanager.cpp +++ b/indra/llmessage/llxfermanager.cpp @@ -150,9 +150,9 @@ void LLXferManager::updateHostStatus() for (status_list_t::iterator iter = mOutgoingHosts.begin(); iter != mOutgoingHosts.end(); ++iter) { - host_statusp = *iter; if (host_statusp->mHost == (*send_iter)->mRemoteHost) { + host_statusp = *iter; break; } } -- cgit v1.2.3