diff options
| author | Don Kjer <don@lindenlab.com> | 2007-09-28 23:32:53 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-09-28 23:32:53 +0000 |
| commit | b089fc559a5dc527ed5e0422e82abf3b1dd5f1b2 (patch) | |
| tree | baa68e98452406c03a3dbe21c99a901f769c8890 /indra/llui/lllineeditor.h | |
| parent | ab8dd2b55008090a1f18fb107f897c736d98a760 (diff) | |
EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
Diffstat (limited to 'indra/llui/lllineeditor.h')
| -rw-r--r-- | indra/llui/lllineeditor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index db6aea8432..6de2fc3eba 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -256,6 +256,8 @@ protected: S32 mBorderThickness; + LLCoordGL mLastIMEPosition; // Last screen position used for the IME editor + BOOL mIgnoreArrowKeys; BOOL mIgnoreTab; BOOL mDrawAsterixes; |