diff options
Diffstat (limited to 'indra/llui/lltextparser.cpp')
| -rw-r--r-- | indra/llui/lltextparser.cpp | 76 |
1 files changed, 47 insertions, 29 deletions
diff --git a/indra/llui/lltextparser.cpp b/indra/llui/lltextparser.cpp index a4fe4f6ca8..76a39e3094 100644 --- a/indra/llui/lltextparser.cpp +++ b/indra/llui/lltextparser.cpp @@ -1,25 +1,31 @@ /** * @file lltextparser.cpp * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. + * $LicenseInfo:firstyear=2001&license=viewergpl$ + * + * Copyright (c) 2001-2009, 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. + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * - * 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. + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception * - * 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 + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ */ @@ -37,14 +43,29 @@ #include "v4color.h" #include "lldir.h" +// Routines used for parsing text for TextParsers and html + +LLTextParser* LLTextParser::sInstance = NULL; + // // Member Functions // -LLTextParser::LLTextParser() -: mLoaded(false) -{} +LLTextParser::~LLTextParser() +{ + sInstance=NULL; +} +// static +LLTextParser* LLTextParser::getInstance() +{ + if (!sInstance) + { + sInstance = new LLTextParser(); + sInstance->loadFromDisk(); + } + return sInstance; +} // Moved triggerAlerts() to llfloaterchat.cpp to break llui/llaudio library dependency. @@ -84,8 +105,6 @@ S32 LLTextParser::findPattern(const std::string &text, LLSD highlight) LLSD LLTextParser::parsePartialLineHighlights(const std::string &text, const LLColor4 &color, EHighlightPosition part, S32 index) { - loadKeywords(); - //evil recursive string atomizer. LLSD ret_llsd, start_llsd, middle_llsd, end_llsd; @@ -176,8 +195,6 @@ LLSD LLTextParser::parsePartialLineHighlights(const std::string &text, const LLC bool LLTextParser::parseFullLineHighlights(const std::string &text, LLColor4 *color) { - loadKeywords(); - for (S32 i=0;i<mHighlights.size();i++) { if ((S32)mHighlights[i]["highlight"]==ALL || (S32)mHighlights[i]["condition"]==MATCHES) @@ -204,14 +221,14 @@ std::string LLTextParser::getFileName() return path; } -void LLTextParser::loadKeywords() +LLSD LLTextParser::loadFromDisk() { - if (mLoaded) - {// keywords already loaded - return; - } std::string filename=getFileName(); - if (!filename.empty()) + if (filename.empty()) + { + llwarns << "LLTextParser::loadFromDisk() no valid user directory." << llendl; + } + else { llifstream file; file.open(filename.c_str()); @@ -220,8 +237,9 @@ void LLTextParser::loadKeywords() LLSDSerialize::fromXML(mHighlights, file); } file.close(); - mLoaded = true; } + + return mHighlights; } bool LLTextParser::saveToDisk(LLSD highlights) |