diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-29 01:40:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-29 01:40:57 +0000 |
| commit | d06e5e3519f13197dd62bfbabf76f7efcc3d7a79 (patch) | |
| tree | 62b363ba11a3cc7dd78343e63ad440284f0252f3 /indra/llui/llkeywords.h | |
| parent | 79680891a73be074aa449a9ccdf695b0afd300d8 (diff) | |
svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
Redo of QAR-170, with correct range. Reviewed by CG.
Diffstat (limited to 'indra/llui/llkeywords.h')
| -rw-r--r-- | indra/llui/llkeywords.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index 4309f16cae..d279d2e627 100644 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -84,7 +84,7 @@ public: BOOL loadFromFile(const LLString& filename); BOOL isLoaded() { return mLoaded; } - void findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text ); + void findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text, const LLColor4 &defaultColor ); #ifdef _DEBUG void dump(); @@ -98,7 +98,7 @@ public: private: LLColor3 readColor(const LLString& s); - void insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len); + void insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor); private: BOOL mLoaded; |