diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-11 10:09:02 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-11 10:09:02 -0400 |
| commit | 8a5c71ea1d278beee89da04036e7923129581baf (patch) | |
| tree | bdb7fd11e134fb2e17a6f2353ff9315672581777 /indra/llui/llkeywords.h | |
| parent | 17520c17b1eff7b26d264c8b6bd1f8ebbbde8d15 (diff) | |
| parent | 0c8164b8947eee7b43ba0452821a3ff6d9f9dd38 (diff) | |
merge
Diffstat (limited to 'indra/llui/llkeywords.h')
| -rw-r--r-- | indra/llui/llkeywords.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index e5b66dfa56..09378e408b 100644 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -129,7 +129,8 @@ public: private: LLColor3 readColor(const std::string& s); - void insertSegment(std::vector<LLTextSegmentPtr> *seg_list, LLTextSegmentPtr new_segment, S32 text_len, const LLColor4 &defaultColor, class LLTextEditor& editor); + 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); BOOL mLoaded; word_token_map_t mWordTokenMap; |