diff options
author | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
commit | 3763386987bd7ab42438a1f1bdf3a78283bcbf51 (patch) | |
tree | b45814d100958d0adb07100440888c56200a5a9a /indra/llui/lltextbase.h | |
parent | 66555b844dfcdb1bbbab472967a90060c5d0838f (diff) | |
parent | 757a955bd700eb4f838762dcbe789a77ee052064 (diff) |
merge changes for vmrg-213
Diffstat (limited to 'indra/llui/lltextbase.h')
-rw-r--r-- | indra/llui/lltextbase.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index b699601908..0549141b72 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -461,6 +461,8 @@ protected: void getSegmentAndOffset( S32 startpos, segment_set_t::const_iterator* seg_iter, S32* offsetp ) const; void getSegmentAndOffset( S32 startpos, segment_set_t::iterator* seg_iter, S32* offsetp ); LLTextSegmentPtr getSegmentAtLocalPos( S32 x, S32 y, bool hit_past_end_of_line = true); + segment_set_t::iterator getEditableSegIterContaining(S32 index); + segment_set_t::const_iterator getEditableSegIterContaining(S32 index) const; segment_set_t::iterator getSegIterContaining(S32 index); segment_set_t::const_iterator getSegIterContaining(S32 index) const; void clearSegments(); |