summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpassetstorage.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2012-12-07 17:50:37 -0500
committerLogan Dethrow <log@lindenlab.com>2012-12-07 17:50:37 -0500
commitb6a7c8fcfdaf9220accf832a4dc07efcd08c6eeb (patch)
tree621f992abc5e2d0ccc596a824ba70828c463ae87 /indra/llmessage/llhttpassetstorage.cpp
parent954200e97f0283a2f16d19601129d64fb16449c2 (diff)
parenta15ec8d014307da35b792659964cd5478d1aafe7 (diff)
Merge in backed out changes.
Diffstat (limited to 'indra/llmessage/llhttpassetstorage.cpp')
-rw-r--r--indra/llmessage/llhttpassetstorage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp
index 612d765969..d6ed08055e 100644
--- a/indra/llmessage/llhttpassetstorage.cpp
+++ b/indra/llmessage/llhttpassetstorage.cpp
@@ -749,7 +749,7 @@ LLAssetRequest* LLHTTPAssetStorage::findNextRequest(LLAssetStorage::request_list
request_list_t::iterator pending_iter = pending.begin();
request_list_t::iterator pending_end = pending.end();
// Loop over all pending requests until we miss finding it in the running list.
- for (; pending_iter != pending.end(); ++pending_iter)
+ for (; pending_iter != pending_end; ++pending_iter)
{
LLAssetRequest* req = *pending_iter;
// Look for this pending request in the running list.