diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-08 10:45:42 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-05-08 10:45:42 +0300 |
| commit | 89b349291c30799c863062e8d8a8b8e6638ceba9 (patch) | |
| tree | 101cde1d13d0df4f6f31ba886d549c3c8752fb49 | |
| parent | d2e38538474a175d4532062dc611ef4a70b96aae (diff) | |
MAINT-7626 fix merge conflict2
| -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 f157f4be56..38ba4b1624 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; |