diff options
author | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
commit | 03290257345c22f909cf1cfac3981e7e07820d21 (patch) | |
tree | 4b4be7538fb1768f32d6b3c2e7cd060b48d2faca /indra/llui/lltextbase.h | |
parent | 889d4d292b2318a2be4988a700d5f56a193a377a (diff) | |
parent | 41ceee848bbbaec892471b6396bd2d2383d10aa3 (diff) |
merge up to latest viewer-development
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(); |