diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-12-11 12:10:48 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-11 12:10:48 -0800 |
commit | 6245ae0baca27e269982fc38309eb122678bd788 (patch) | |
tree | a34c0d947b9ae508d856014a5457476116341c4d /indra | |
parent | f0da8a742015bdc63d044cba6dc249b20b8f5b45 (diff) | |
parent | bbfb25077be20be7b4c1b98893070e7986e134c5 (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/llmediadataclient.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp index 0a20a4a1c9..2694075a58 100755 --- a/indra/newview/llmediadataclient.cpp +++ b/indra/newview/llmediadataclient.cpp @@ -58,12 +58,19 @@ // - Any request that gets a 503 still goes through the retry logic // +// +// Forward decls +// const F32 LLMediaDataClient::QUEUE_TIMER_DELAY = 1.0; // seconds(s) const F32 LLMediaDataClient::UNAVAILABLE_RETRY_TIMER_DELAY = 5.0; // secs const U32 LLMediaDataClient::MAX_RETRIES = 4; const U32 LLMediaDataClient::MAX_SORTED_QUEUE_SIZE = 10000; const U32 LLMediaDataClient::MAX_ROUND_ROBIN_QUEUE_SIZE = 10000; +// << operators +std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::request_queue_t &q); +std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::Request &q); + ////////////////////////////////////////////////////////////////////////////////////// // // LLMediaDataClient |