diff options
Diffstat (limited to 'indra/llcommon/llmortician.cpp')
-rw-r--r-- | indra/llcommon/llmortician.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/indra/llcommon/llmortician.cpp b/indra/llcommon/llmortician.cpp index b6ad40c2af..00d4a32553 100644 --- a/indra/llcommon/llmortician.cpp +++ b/indra/llcommon/llmortician.cpp @@ -1,24 +1,24 @@ -/** +/** * @file llmortician.cpp * * $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$ */ @@ -32,9 +32,9 @@ std::list<LLMortician*> LLMortician::sGraveyard; BOOL LLMortician::sDestroyImmediate = FALSE; -LLMortician::~LLMortician() +LLMortician::~LLMortician() { - sGraveyard.remove(this); + sGraveyard.remove(this); } size_t LLMortician::logClass(std::stringstream &str) @@ -73,34 +73,34 @@ size_t LLMortician::logClass(std::stringstream &str) return size; } -void LLMortician::updateClass() +void LLMortician::updateClass() { - while (!sGraveyard.empty()) - { - LLMortician* dead = sGraveyard.front(); - delete dead; - } + while (!sGraveyard.empty()) + { + LLMortician* dead = sGraveyard.front(); + delete dead; + } } -void LLMortician::die() +void LLMortician::die() { - // It is valid to call die() more than once on something that hasn't died yet - if (sDestroyImmediate) - { - // *NOTE: This is a hack to ensure destruction order on shutdown (relative to non-mortician controlled classes). - mIsDead = TRUE; - delete this; - return; - } - else if (!mIsDead) - { - mIsDead = TRUE; - sGraveyard.push_back(this); - } + // It is valid to call die() more than once on something that hasn't died yet + if (sDestroyImmediate) + { + // *NOTE: This is a hack to ensure destruction order on shutdown (relative to non-mortician controlled classes). + mIsDead = TRUE; + delete this; + return; + } + else if (!mIsDead) + { + mIsDead = TRUE; + sGraveyard.push_back(this); + } } // static void LLMortician::setZealous(BOOL b) { - sDestroyImmediate = b; + sDestroyImmediate = b; } |