summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCinder <cinder.roxley@phoenixviewer.com>2014-05-16 09:18:38 -0600
committerCinder <cinder.roxley@phoenixviewer.com>2014-05-16 09:18:38 -0600
commit8c970eae222eb94d42e951e47153b97de744f6e5 (patch)
tree704a7d145fa28722d760073e3f0abad051c8240a
parentbe45cff44fae3f2e28ab4784e7b73aac20f736f9 (diff)
Remove orphaned LLKeywords methods
-rwxr-xr-xindra/llui/llkeywords.cpp34
-rwxr-xr-xindra/llui/llkeywords.h4
2 files changed, 0 insertions, 38 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index f633f3e4af..b4e3ccbf5e 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -82,12 +82,6 @@ LLKeywords::~LLKeywords()
mDelimiterTokenList.clear();
}
-void LLKeywords::addColorGroup(const std::string& key_in, const LLColor4& color)
-{
- WStringMapIndex key ( utf8str_to_wstring(key_in) );
- mColorGroupMap[key] = color;
-}
-
// Add the token as described
void LLKeywords::addToken(LLKeywordToken::ETokenType type,
const std::string& key_in,
@@ -495,34 +489,6 @@ bool LLKeywords::WStringMapIndex::operator<(const LLKeywords::WStringMapIndex &o
return result;
}
-LLColor4 LLKeywords::readColor( const std::string& s )
-{
- F32 r, g, b;
- r = g = b = 0.0f;
- S32 values_read = sscanf(s.c_str(), "%f, %f, %f]", &r, &g, &b );
- if( values_read != 3 )
- {
- llinfos << " poorly formed color in keyword file" << llendl;
- }
- return LLColor4( r, g, b, 1.f);
-}
-
-LLColor4 LLKeywords::readColor(LLSD& sd)
-{
- if (sd.isArray())
- {
- return LLColor4(sd, 1.f);
- }
- else if (sd.isMap())
- {
- return LLColor4( sd.get("x").asReal(), sd.get("y").asReal(), sd.get("z").asReal(), 1.f );
- }
- else
- {
- return LLColor4::black;
- }
-}
-
LLTrace::BlockTimerStatHandle FTM_SYNTAX_COLORING("Syntax Coloring");
// Walk through a string, applying the rules specified by the keyword token list and
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index eecb327fee..4e20b4459e 100755
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -109,7 +109,6 @@ public:
LLKeywords();
~LLKeywords();
- void addColorGroup(const std::string& key_in, const LLColor4& color);
void clearLoaded() { mLoaded = false; }
LLColor4 getColorGroup(const std::string& key_in);
bool isLoaded() const { return mLoaded; }
@@ -168,12 +167,9 @@ public:
protected:
void processTokensGroup(const LLSD& Tokens, const std::string& Group);
- LLColor4 readColor(const std::string& s);
- LLColor4 readColor(LLSD& sd);
void insertSegment(std::vector<LLTextSegmentPtr>& seg_list, LLTextSegmentPtr new_segment, S32 text_len, const LLColor4 &defaultColor, class LLTextEditor& editor);
void insertSegments(const LLWString& wtext, std::vector<LLTextSegmentPtr>& seg_list, LLKeywordToken* token, S32 text_len, S32 seg_start, S32 seg_end, const LLColor4 &defaultColor, LLTextEditor& editor);
- LLSD mColors;
bool mLoaded;
LLSD mSyntax;
word_token_map_t mWordTokenMap;