diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-10 15:16:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-10 15:16:08 -0500 |
| commit | aab53dc25021dfb9b0a734480233e352a82486cd (patch) | |
| tree | de9c71677f9955112c0b01bf8c064404bd862f53 /indra/llui/llkeywords.h | |
| parent | 1d92a950df91d7e6d3a34e925f445bc389a3fa93 (diff) | |
| parent | 3ea0018dc6f94c029d7dbf13bdd5b0bc0558c8d8 (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; |