diff options
author | McCabe Maxsted | 2009-06-08 10:15:15 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-08 10:15:15 -0700 |
commit | 125e5b1b97bdcfd328f322ee8871435119cd9e4d (patch) | |
tree | 07cc4660a345e849f7bdde644dcf43e0499c8162 /linden/indra/newview/llimpanel.cpp | |
parent | Merged in 1.2.0-landsqm (diff) | |
parent | Communicate window now shows the number of unread IMs (diff) | |
download | meta-impy-125e5b1b97bdcfd328f322ee8871435119cd9e4d.zip meta-impy-125e5b1b97bdcfd328f322ee8871435119cd9e4d.tar.gz meta-impy-125e5b1b97bdcfd328f322ee8871435119cd9e4d.tar.bz2 meta-impy-125e5b1b97bdcfd328f322ee8871435119cd9e4d.tar.xz |
Merged in 1.2.0-communicatetitle
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
-rw-r--r-- | linden/indra/newview/llimpanel.cpp | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 16d64ac..f30ae8c 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp | |||
@@ -49,6 +49,7 @@ | |||
49 | #include "llconsole.h" | 49 | #include "llconsole.h" |
50 | #include "llfloater.h" | 50 | #include "llfloater.h" |
51 | #include "llfloatergroupinfo.h" | 51 | #include "llfloatergroupinfo.h" |
52 | #include "llfloaterchatterbox.h" | ||
52 | #include "llimview.h" | 53 | #include "llimview.h" |
53 | #include "llinventory.h" | 54 | #include "llinventory.h" |
54 | #include "llinventorymodel.h" | 55 | #include "llinventorymodel.h" |
@@ -1170,6 +1171,7 @@ void LLFloaterIMPanel::init(const std::string& session_label) | |||
1170 | FALSE); | 1171 | FALSE); |
1171 | 1172 | ||
1172 | setTitle(mSessionLabel); | 1173 | setTitle(mSessionLabel); |
1174 | |||
1173 | mInputEditor->setMaxTextLength(1023); | 1175 | mInputEditor->setMaxTextLength(1023); |
1174 | // enable line history support for instant message bar | 1176 | // enable line history support for instant message bar |
1175 | mInputEditor->setEnableLineHistory(TRUE); | 1177 | mInputEditor->setEnableLineHistory(TRUE); |
@@ -1498,7 +1500,21 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4 | |||
1498 | && hostp | 1500 | && hostp |
1499 | && source != gAgent.getID()) | 1501 | && source != gAgent.getID()) |
1500 | { | 1502 | { |
1501 | hostp->setFloaterFlashing(this, TRUE); | 1503 | // Only start flashing on first update so we can |
1504 | // get the proper unread number of unread tabs here | ||
1505 | if (!hostp->isFloaterFlashing(this)) | ||
1506 | { | ||
1507 | hostp->setFloaterFlashing(this, TRUE); | ||
1508 | LLFloaterChatterBox::markAsUnread(true); | ||
1509 | } | ||
1510 | |||
1511 | //// Only increment the number of unread IMs if they're from individuals | ||
1512 | //// We increment the first received for the rest during new IM creation. | ||
1513 | //if (mDialog == IM_SESSION_P2P_INVITE || | ||
1514 | // mDialog == IM_NOTHING_SPECIAL) | ||
1515 | //{ | ||
1516 | // LLFloaterChatterBox::markAsUnread(true); | ||
1517 | //} | ||
1502 | } | 1518 | } |
1503 | } | 1519 | } |
1504 | 1520 | ||
@@ -1566,13 +1582,17 @@ void LLFloaterIMPanel::setVisible(BOOL b) | |||
1566 | LLMultiFloater* hostp = getHost(); | 1582 | LLMultiFloater* hostp = getHost(); |
1567 | if( b && hostp ) | 1583 | if( b && hostp ) |
1568 | { | 1584 | { |
1569 | hostp->setFloaterFlashing(this, FALSE); | 1585 | if (hostp->isFloaterFlashing(this)) |
1570 | 1586 | { | |
1571 | /* Don't change containing floater title - leave it "Instant Message" JC | 1587 | hostp->setFloaterFlashing(this, FALSE); |
1572 | LLUIString title = sTitleString; | 1588 | LLFloaterChatterBox::markAsUnread(false); |
1573 | title.setArg("[NAME]", mSessionLabel); | 1589 | |
1574 | hostp->setTitle( title ); | 1590 | /* Don't change containing floater title - leave it "Instant Message" JC |
1575 | */ | 1591 | LLUIString title = sTitleString; |
1592 | title.setArg("[NAME]", mSessionLabel); | ||
1593 | hostp->setTitle( title ); | ||
1594 | */ | ||
1595 | } | ||
1576 | } | 1596 | } |
1577 | } | 1597 | } |
1578 | 1598 | ||