diff options
| author | Don Kjer <don@lindenlab.com> | 2007-11-09 01:56:15 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-11-09 01:56:15 +0000 |
| commit | c1920e3c1c60fb792cf091750b05de618b355878 (patch) | |
| tree | 204b78e0f0b87fb2875b90af0f579d53e3138cbb /indra/llwindow/llwindowwin32.h | |
| parent | 760f2ceb1518d87e865f25ac87a540625e974517 (diff) | |
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 938ece912c..62b1f73ced 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -187,6 +187,7 @@ protected: static HKL sWinInputLocale; static DWORD sWinIMEConversionMode; static DWORD sWinIMESentenceMode; + static LLCoordWindow sWinIMEWindowPosition; friend class LLWindowManager; }; |