diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-11 17:06:35 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-11 17:06:35 +0200 |
commit | 5f8771ea9ee44359a516117a4908583b30b58138 (patch) | |
tree | 0b40962f2107f1b9178ef490c18f508f73a1c4a8 /indra/newview/llimfloater.cpp | |
parent | 8523d2d5b641cb5b0e4557237700065bd24daf83 (diff) | |
parent | 73bba2bab49cb255d320e0209e54377dcc010fc3 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 8b44ccebdd..fd297986fc 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -517,7 +517,7 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void* LLIMModel::LLIMSession* im_session = LLIMModel::instance().findIMSession(self->mSessionID); //TODO: While disabled lllineeditor can receive focus we need to check if it is enabled (EK) - if( im_session && im_session->mTextIMPossible && !self->mInputEditor->getEnabled()) + if( im_session && im_session->mTextIMPossible && self->mInputEditor->getEnabled()) { //in disconnected state IM input editor should be disabled self->mInputEditor->setEnabled(!gDisconnected); |