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/llwindow/llwindowwin32.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/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 5eb2cfbb79..cb105c2128 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -87,6 +87,7 @@ public: /*virtual*/ void focusClient(); /*virtual*/ void allowLanguageTextInput(BOOL b); + /*virtual*/ void setLanguageTextInput( const LLCoordGL & pos ); protected: LLWindowWin32( @@ -156,11 +157,10 @@ protected: BOOL mMousePositionModified; BOOL mInputProcessingPaused; - // The following five variables are for Language Text Input control. + // The following variables are for Language Text Input control. // They are all static, since one context is shared by all LLWindowWin32 // instances. static BOOL sLanguageTextInputAllowed; - static BOOL sWinIMEOpened; static HKL sWinInputLocale; static DWORD sWinIMEConversionMode; static DWORD sWinIMESentenceMode; |