diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
| commit | dc48f1c7417f0f49ad1bd32330845ce17a29eece (patch) | |
| tree | 8772aff5f32c1702228b7ca7e324fbd077269854 /indra/test/io.cpp | |
| parent | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (diff) | |
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
Diffstat (limited to 'indra/test/io.cpp')
| -rw-r--r-- | indra/test/io.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/test/io.cpp b/indra/test/io.cpp index c322522ce3..3de1e8edef 100644 --- a/indra/test/io.cpp +++ b/indra/test/io.cpp @@ -1151,7 +1151,7 @@ namespace tut chain.push_back(LLIOPipe::ptr_t(new LLPipeStringInjector("hi"))); chain.push_back(LLIOPipe::ptr_t(new LLIOSocketWriter(client))); chain.push_back(LLIOPipe::ptr_t(new LLIONull)); - mPump->addChain(chain, 0.2); + mPump->addChain(chain, 0.2f); chain.clear(); // pump for a bit and make sure all 3 chains are running |