diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-29 13:22:51 -0500 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-29 13:22:51 -0500 |
| commit | ab272c20a914c4816cee55db7a4bdd0217580630 (patch) | |
| tree | fb01ac96b7c273e6d58e85da6d4d42b48b18063e /indra/newview/llimview.cpp | |
| parent | 0f24668b0a834e37a3a8767abc7b0ee51bf23fcd (diff) | |
| parent | 305d11191078fbd548a6c64bfae2eae89101c390 (diff) | |
Another Chui beta6+ merge to deal with build issues
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 425f9d67a2..73b9d275c7 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -174,7 +174,7 @@ void on_new_message(const LLSD& msg) // determine state of conversations floater enum {CLOSED, NOT_ON_TOP, ON_TOP, ON_TOP_AND_ITEM_IS_SELECTED} conversations_floater_status; - conversations_floater_status = ON_TOP; + LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id); @@ -188,13 +188,13 @@ void on_new_message(const LLSD& msg) { conversations_floater_status = NOT_ON_TOP; } - else if (session_floater->hasFocus()) + else if ((session_floater->hasFocus()) && (im_box->getSelectedSession() == session_id)) { - conversations_floater_status = ON_TOP; + conversations_floater_status = ON_TOP_AND_ITEM_IS_SELECTED; } - else if((session_floater->hasFocus()) && (im_box->getSelectedSession() == session_id)) + else { - conversations_floater_status = ON_TOP_AND_ITEM_IS_SELECTED; + conversations_floater_status = ON_TOP; } // determine user prefs for this session |