diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-07 22:17:20 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-07 22:17:20 +0300 |
| commit | d2e38538474a175d4532062dc611ef4a70b96aae (patch) | |
| tree | 89f81f346095253b802b34f82c885bd876f83a79 | |
| parent | 8fe1a35424432f4331a9038ef2fee2d2602dfdad (diff) | |
MAINT-7626 fix merge conflict
| -rw-r--r-- | indra/llmessage/llxfermanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |