diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-25 20:02:36 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-25 20:02:36 +0300 |
| commit | 1c5659b1caffa30d35e1ffc74d18c037f6332c31 (patch) | |
| tree | e278c9632c1e83792532d6ff2880e43e3a0e04bb | |
| parent | e4207901d782c8f1167736d7beee9d0ce0ae1086 (diff) | |
CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0
| -rw-r--r-- | indra/llui/llchatentry.cpp | 10 | ||||
| -rw-r--r-- | indra/llui/llchatentry.h | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp index 6a1b48a08a..f6c4b69308 100644 --- a/indra/llui/llchatentry.cpp +++ b/indra/llui/llchatentry.cpp @@ -163,16 +163,6 @@ bool LLChatEntry::useLabel() return !getLength() && !mLabel.empty(); } -void LLChatEntry::onFocusReceived() -{ - -} - -void LLChatEntry::onFocusLost() -{ - -} - BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask) { BOOL handled = FALSE; diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h index 49c8d21450..a20a505ae1 100644 --- a/indra/llui/llchatentry.h +++ b/indra/llui/llchatentry.h @@ -62,8 +62,6 @@ public: virtual void draw(); virtual void onCommit(); - /*virtual*/ void onFocusReceived(); - /*virtual*/ void onFocusLost(); void enableSingleLineMode(bool single_line_mode); boost::signals2::connection setTextExpandedCallback(const commit_signal_t::slot_type& cb); diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 43c0090993..ca9410de2e 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -159,9 +159,8 @@ LLWinImm LLWinImm::sTheInstance; LLWinImm::LLWinImm() : mHImmDll(NULL) { // Check system metrics - if ( !GetSystemMetrics( SM_DBCSENABLED ) ) + if ( !GetSystemMetrics( SM_IMMENABLED ) ) return; - mHImmDll = LoadLibraryA("Imm32"); if (mHImmDll != NULL) |