From dc48f1c7417f0f49ad1bd32330845ce17a29eece Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Thu, 3 Apr 2008 22:50:22 +0000 Subject: 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 --- indra/test/io.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/test/io.cpp') 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 -- cgit v1.2.3