diff options
author | Ima Mechanique <ima.mechanique@secondlife.com> | 2014-03-28 17:21:36 +0000 |
---|---|---|
committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2014-03-28 17:21:36 +0000 |
commit | 8bc42784122619e3f37afabbc5888821c3430369 (patch) | |
tree | d20fa686a1f4b4379231ea8363da217e43eea774 | |
parent | 8e53c5bfb0e9feffa0450b362f21f56036b9b75c (diff) |
strom-1831: Cleaning out commented and unused code
-rwxr-xr-x | indra/llui/llkeywords.cpp | 10 | ||||
-rwxr-xr-x | indra/llui/llkeywords.h | 1 | ||||
-rw-r--r-- | indra/newview/llsyntaxid.h | 3 |
3 files changed, 0 insertions, 14 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 82b50f43ab..b495709ce0 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -134,16 +134,6 @@ void LLKeywords::addToken(LLKeywordToken::TOKEN_TYPE type, } } -void LLKeywords::clear() -{ - clearLoaded(); - mSyntax = LLSD(); - - std::for_each(mWordTokenMap.begin(), mWordTokenMap.end(), DeletePairedPointer()); - std::for_each(mLineTokenList.begin(), mLineTokenList.end(), DeletePointer()); - std::for_each(mDelimiterTokenList.begin(), mDelimiterTokenList.end(), DeletePointer()); -} - std::string LLKeywords::getArguments(LLSD& arguments) { std::string argString = ""; diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index de7645a5d2..689fd75bcd 100755 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -110,7 +110,6 @@ public: ~LLKeywords(); void addColorGroup(const std::string key_in, const LLColor4 color); - void clear(); void clearLoaded() { mLoaded = false; } LLColor4 getColorGroup(const std::string key_in); bool isLoaded() const { return mLoaded; } diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h index 1b6903f2a2..7d6e120038 100644 --- a/indra/newview/llsyntaxid.h +++ b/indra/newview/llsyntaxid.h @@ -54,8 +54,6 @@ public: static const std::string SIMULATOR_FEATURE; protected: - //LLViewerRegion* region; - static bool sInitialised; static LLSD sKeywordsXml; static bool sLoaded; @@ -111,7 +109,6 @@ protected: void setFileNameCurrent(std::string& name) { mFileNameCurrent = name; } void setFileNameDefault(std::string& name) { mFileNameDefault = name; } void setFileNameNew(std::string name) { mFileNameNew = name; } -// void setSimulatorFeatureName(const std::string& name) { mSimulatorFeature = name; } }; |