diff options
author | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
commit | 15e6939342956f830996299352bcf7fffa7c3b85 (patch) | |
tree | dcd6443f049d35b3f3401d768b1eab735eda363b /indra/llmessage/llxfermanager.h | |
parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
parent | 1d0d485b69bbbfd63d2d56a795d818131db2667c (diff) |
merge with release
Diffstat (limited to 'indra/llmessage/llxfermanager.h')
-rwxr-xr-x | indra/llmessage/llxfermanager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llxfermanager.h b/indra/llmessage/llxfermanager.h index b84bccb5b7..b3d110e7a1 100755 --- a/indra/llmessage/llxfermanager.h +++ b/indra/llmessage/llxfermanager.h @@ -41,7 +41,7 @@ class LLVFS; #include "message.h" #include "llassetstorage.h" #include "lldir.h" -#include "lllinkedqueue.h" +#include <deque> #include "llthrottle.h" class LLHostStatus @@ -80,7 +80,7 @@ class LLXferManager S32 mMaxIncomingXfers; BOOL mUseAckThrottling; // Use ack throttling to cap file xfer bandwidth - LLLinkedQueue<LLXferAckInfo> mXferAckQueue; + std::deque<LLXferAckInfo> mXferAckQueue; LLThrottle mAckThrottle; public: |