diff options
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llimconversation.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llimfloater.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 15 |
4 files changed, 15 insertions, 11 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index f9a3a05e59..70f2446752 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -415,7 +415,7 @@ void LLConversationViewParticipant::draw() F32 text_left = (F32)getLabelXPos(); LLColor4 color = mIsSelected ? sHighlightFgColor : sFgColor; - drawHighlight(show_context, true, sHighlightBgColor, sFocusOutlineColor, sMouseOverColor); + drawHighlight(show_context, mIsSelected, sHighlightBgColor, sFocusOutlineColor, sMouseOverColor); drawLabel(font, text_left, y, color, right_x); LLView::draw(); diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index 9f3c6d0f3d..2027f79eea 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -222,8 +222,8 @@ void LLIMConversation::onFocusReceived() if (! mHadFocus) { - LLIMFloaterContainer* container = LLIMFloaterContainer::getInstance(); - container->setConvItemSelect(mSessionID); + // LLIMFloaterContainer* container = LLIMFloaterContainer::getInstance(); + // container->setConvItemSelect(mSessionID); } } diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index a8add9c6ab..e4032738a7 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -725,6 +725,7 @@ void LLIMFloater::setFocus(BOOL focusFlag) updateMessages(); mInputEditor->setFocus(TRUE); } + } void LLIMFloater::setVisible(BOOL visible) @@ -754,8 +755,10 @@ void LLIMFloater::setVisible(BOOL visible) if (visible && isInVisibleChain()) { sIMFloaterShowedSignal(mSessionID); - setFocus(TRUE); + } + + setFocus(visible); } BOOL LLIMFloater::getVisible() diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index a0ddc9b52b..a89ae4a2dc 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -274,23 +274,24 @@ void LLNearbyChat::removeScreenChat() void LLNearbyChat::setFocus(BOOL focusFlag) { LLTransientDockableFloater::setFocus(focusFlag); - + //Redirect focus to input editor if (focusFlag) { mInputEditor->setFocus(TRUE); } + } void LLNearbyChat::setVisible(BOOL visible) { - if(visible) - { - removeScreenChat(); - setFocus(TRUE); - } - LLIMConversation::setVisible(visible); + + if(visible) + { + removeScreenChat(); + } + setFocus(visible); } |