summaryrefslogtreecommitdiff
path: root/indra/llui/llkeywords.h
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-07 12:56:29 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-07 12:56:29 +0300
commit6bbe55558f09026593d7c370fc27cf381dabb802 (patch)
tree2f79ab381eeea3fe9189da914547e84d4854788c /indra/llui/llkeywords.h
parentd1751df1cc5d9bf853f29555de94faec1912e19f (diff)
EXT-7623 FIX One more place where text was processed into segments without LLLineBreakSegment.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/516/ --HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llkeywords.h')
-rw-r--r--indra/llui/llkeywords.h3
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;