1 files changed, 54 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterchatterbox.cpp b/linden/indra/newview/llfloaterchatterbox.cpp
index 1114635..e7de62c 100644
--- a/linden/indra/newview/llfloaterchatterbox.cpp
+++ b/linden/indra/newview/llfloaterchatterbox.cpp
@@ -88,6 +88,10 @@ void* LLFloaterMyFriends::createGroupsPanel(void* data)
 //
 // LLFloaterChatterBox
 //
+
+static std::string sTitle = "Communicate";
+static int sUnreadCount = 0;
+
 LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
         mActiveVoiceFloater(NULL)
 {
@@ -122,6 +126,9 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
                 addFloater(LLFloaterChat::getInstance(LLSD()), FALSE);
         }
         mTabContainer->lockTabs();
+
+        sUnreadCount = 0;
+        sTitle = getTitle();
 }
 
 LLFloaterChatterBox::~LLFloaterChatterBox()
@@ -217,6 +224,53 @@ void LLFloaterChatterBox::setMinimized(BOOL minimized)
         LLFloaterChat::getInstance()->updateConsoleVisibility();
 }
 
+void LLFloaterChatterBox::markAsUnread(bool unread)
+{
+        LLFloaterChatterBox* floater = LLFloaterChatterBox::getInstance();
+
+        // Update IM unread count
+        if (unread)
+        {
+                sUnreadCount++;
+        }
+        else if (!unread)
+        {
+                sUnreadCount--;
+        }
+
+        if (floater)
+        {
+                // Update the title message with the number of unread IMs. 
+                // Remove the message when we hit 0.
+                if (sUnreadCount > 0)
+                {
+                        // Check for plurals
+                        std::string unread_string;
+                        if (sUnreadCount == 1)
+                        {
+                                unread_string = floater->getString("unread_count_string_singular");
+                        }
+                        else
+                        {
+                                unread_string = floater->getString("unread_count_string_plural");
+                        }
+
+                        std::ostringstream unread_count_message;
+                        unread_count_message << sTitle << " (" << sUnreadCount << " " << unread_string << ")";
+
+                        // Update the floater title
+                        floater->setTitle(unread_count_message.str());
+                }
+                else
+                {
+                        sUnreadCount = 0;
+                        
+                        // Update the floater title
+                        floater->setTitle(sTitle);
+                }
+        }
+}
+
 void LLFloaterChatterBox::removeFloater(LLFloater* floaterp)
 {
         if (floaterp->getName() == "chat floater")