diff options
| author | Graham Linden <none@none> | 2014-09-25 09:20:01 -0700 |
|---|---|---|
| committer | Graham Linden <none@none> | 2014-09-25 09:20:01 -0700 |
| commit | 9f4788d7a8a924de654d55bfb102a81f797a9cf9 (patch) | |
| tree | 742fb8127dc84052265647ed110e8a6446253103 /indra/newview/llfloaterimsession.cpp | |
| parent | 6004ad167458914c3b85438b96e81ea8796e368b (diff) | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
Merge viewer-release 3.7.17
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimsession.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 7852a1f7b3..9def253ba5 100755 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -927,8 +927,7 @@ void LLFloaterIMSession::onInputEditorFocusReceived( LLFocusableElement* caller, // Allow enabling the LLFloaterIMSession input editor only if session can accept text 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->getReadOnly()) { //in disconnected state IM input editor should be disabled self->mInputEditor->setEnabled(!gDisconnected); |