diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:43:57 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:43:57 +0000 |
commit | 0a8e19d4980edabe62173b1f46d99812cbe27477 (patch) | |
tree | 34d121e89af66a5dd2cd690089db40198c00a707 /indra/llui/lllineeditor.h | |
parent | 9b0236990ba2df3c7c890d2d351724b455eddbb0 (diff) | |
parent | 35e5a5005e7ab85a640aee08137a96c42e4d55ea (diff) |
merge.
Diffstat (limited to 'indra/llui/lllineeditor.h')
-rw-r--r-- | indra/llui/lllineeditor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 4c4b00094d..b96220e020 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -303,8 +303,8 @@ protected: LLFrameTimer mScrollTimer; S32 mTextPadLeft; // Used to reserve space before the beginning of the text for children. S32 mTextPadRight; // Used to reserve space after the end of the text for children. - S32 mMinHPixels; - S32 mMaxHPixels; + S32 mTextLeftEdge; // Pixels, cached left edge of text based on left padding and width + S32 mTextRightEdge; // Pixels, cached right edge of text based on right padding and width BOOL mCommitOnFocusLost; BOOL mRevertOnEsc; |