diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-22 20:51:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 20:51:58 +0300 |
| commit | 6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a (patch) | |
| tree | fab23811a5cedc1ebf01479c852ee92ff62b636c /indra/llmessage/llchainio.cpp | |
| parent | ef8f4819822288e044ea719feb6af7a1f4df4c4e (diff) | |
| parent | 7bb5afc11ee5a6af78302a8d76a9a619e2baaab2 (diff) | |
Merge pull request #1545 from Ansariel/DRTVWR-600-maint-A
Merge main into DRTVWR-600-maint-a
Diffstat (limited to 'indra/llmessage/llchainio.cpp')
| -rw-r--r-- | indra/llmessage/llchainio.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/indra/llmessage/llchainio.cpp b/indra/llmessage/llchainio.cpp index bcda6746a1..78dff246cb 100644 --- a/indra/llmessage/llchainio.cpp +++ b/indra/llmessage/llchainio.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llchainio.cpp * @author Phoenix * @date 2005-08-04 @@ -7,21 +7,21 @@ * $LicenseInfo:firstyear=2005&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -38,20 +38,20 @@ */ // static bool LLDeferredChain::addToPump( - LLPumpIO* pump, - F32 in_seconds, - const LLPumpIO::chain_t& deferred_chain, - F32 chain_timeout) + LLPumpIO* pump, + F32 in_seconds, + const LLPumpIO::chain_t& deferred_chain, + F32 chain_timeout) { - if(!pump) return false; - LLPumpIO::chain_t sleep_chain; - sleep_chain.push_back(LLIOPipe::ptr_t(new LLIOSleep(in_seconds))); - sleep_chain.push_back( - LLIOPipe::ptr_t(new LLIOAddChain(deferred_chain, chain_timeout))); + if(!pump) return false; + LLPumpIO::chain_t sleep_chain; + sleep_chain.push_back(LLIOPipe::ptr_t(new LLIOSleep(in_seconds))); + sleep_chain.push_back( + LLIOPipe::ptr_t(new LLIOAddChain(deferred_chain, chain_timeout))); - // give it a litle bit of padding. - pump->addChain(sleep_chain, in_seconds + 10.0f); - return true; + // give it a litle bit of padding. + pump->addChain(sleep_chain, in_seconds + 10.0f); + return true; } /** @@ -69,20 +69,20 @@ LLChainIOFactory::~LLChainIOFactory() #if 0 bool LLChainIOFactory::build(LLIOPipe* in, LLIOPipe* out) const { - if(!in || !out) - { - return false; - } - LLIOPipe* first = NULL; - LLIOPipe* last = NULL; - if(build_impl(first, last) && first && last) - { - in->connect(first); - last->connect(out); - return true; - } - LLIOPipe::ptr_t foo(first); - LLIOPipe::ptr_t bar(last); - return false; + if(!in || !out) + { + return false; + } + LLIOPipe* first = NULL; + LLIOPipe* last = NULL; + if(build_impl(first, last) && first && last) + { + in->connect(first); + last->connect(out); + return true; + } + LLIOPipe::ptr_t foo(first); + LLIOPipe::ptr_t bar(last); + return false; } #endif |