From 89b349291c30799c863062e8d8a8b8e6638ceba9 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 8 May 2018 10:45:42 +0300
Subject: [PATCH] MAINT-7626 fix merge conflict2
---
indra/llmessage/llxfermanager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index f157f4be563..38ba4b16245 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -150,7 +150,7 @@ void LLXferManager::updateHostStatus()
for (status_list_t::iterator iter = mOutgoingHosts.begin();
iter != mOutgoingHosts.end(); ++iter)
{
- if (host_statusp->mHost == (*send_iter)->mRemoteHost)
+ if ((*iter)->mHost == (*send_iter)->mRemoteHost)
{
host_statusp = *iter;
break;
--
GitLab