From 2a0d588cb5061cb82c19d31b4b7c679357cec076 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Fri, 6 Sep 2013 15:00:01 +0200
Subject: [PATCH] Changed: Merged code from official client

---
 .../client/src/interface_v3/chat_window.cpp   | 56 +++++++++----------
 .../src/input_output_service/chat_manager.cpp | 12 ++++
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp
index 24b1e15c6..e74392432 100644
--- a/code/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_window.cpp
@@ -924,33 +924,28 @@ void CChatGroupWindow::removeAllFreeTellers()
 void CChatGroupWindow::saveFreeTeller(NLMISC::IStream &f)
 {
 	f.serialVersion(2);
-	
-	uint32 nNbFreeTellerSaved = 0;
-	
-	f.serial(nNbFreeTellerSaved);
-	
-	// Don't save the free tellers
-	//// Save the free teller only if it is present in the friend list to avoid the only-growing situation
-	//// because free tellers are never deleted in game if we save/load all the free tellers, we just create more
-	//// and more container.
-	
-	//uint32 i, nNbFreeTellerSaved = 0;
-	//for (i = 0; i < _FreeTellers.size(); ++i)
-	//	if (PeopleInterraction.FriendList.getIndexFromName(_FreeTellers[i]->getUCTitle()) != -1)
-	//		nNbFreeTellerSaved++;
-	
-	//f.serial(nNbFreeTellerSaved);
-	
-	//for (i = 0; i < _FreeTellers.size(); ++i)
-	//{
-	//	CGroupContainer *pGC = _FreeTellers[i];
-	//	if (PeopleInterraction.FriendList.getIndexFromName(pGC->getUCTitle()) != -1)
-	//	{
-	//		ucstring sTitle = pGC->getUCTitle();
-	//		f.serial(sTitle);
-	//	}
-	//}
 
+	// Save the free teller only if it is present in the friend list to avoid the only-growing situation
+	// because free tellers are never deleted in game if we save/load all the free tellers, we just create more
+	// and more container.
+
+	uint32 i, nNbFreeTellerSaved = 0;
+	for (i = 0; i < _FreeTellers.size(); ++i)
+		if (PeopleInterraction.FriendList.getIndexFromName(_FreeTellers[i]->getUCTitle()) != -1)
+			nNbFreeTellerSaved++;
+
+	f.serial(nNbFreeTellerSaved);
+
+	for (i = 0; i < _FreeTellers.size(); ++i)
+	{
+		CGroupContainer *pGC = _FreeTellers[i];
+
+		if (PeopleInterraction.FriendList.getIndexFromName(pGC->getUCTitle()) != -1)
+		{
+			ucstring sTitle = pGC->getUCTitle();
+			f.serial(sTitle);
+		}
+	}
 }
 
 //=================================================================================
@@ -979,12 +974,11 @@ void CChatGroupWindow::loadFreeTeller(NLMISC::IStream &f)
 		ucstring sTitle;
 		f.serial(sTitle);
 
-		// Don't actually create the free teller
-		//CGroupContainer *pGC = createFreeTeller(sTitle, "");
+		CGroupContainer *pGC = createFreeTeller(sTitle, "");
 
-		//// With version 1 all tells are active because windows information have "title based" ids and no "sID based".
-		//if ((ver == 1) && (pGC != NULL))
-		//	pGC->setActive(false);
+		// With version 1 all tells are active because windows information have "title based" ids and no "sID based".
+		if ((ver == 1) && (pGC != NULL))
+			pGC->setActive(false);
 	}
 }
 
diff --git a/code/ryzom/server/src/input_output_service/chat_manager.cpp b/code/ryzom/server/src/input_output_service/chat_manager.cpp
index a4765c300..50c58fce6 100644
--- a/code/ryzom/server/src/input_output_service/chat_manager.cpp
+++ b/code/ryzom/server/src/input_output_service/chat_manager.cpp
@@ -636,6 +636,18 @@ void CChatManager::chat( const TDataSetRow& sender, const ucstring& ucstr )
 			{
 				if (session->WriteRight) // player must have the right to speak in the channel
 				{
+					// If universal channel check if player muted
+					if (session->getChan()->UniversalChannel)
+					{
+						if(_MutedUsers.find( eid ) != _MutedUsers.end())
+						{
+							nldebug("IOSCM:  chat The player %s:%x is muted",
+								TheDataset.getEntityId(sender).toString().c_str(),
+								sender.getIndex());
+							return;
+						}
+					}
+
 					if (!session->getChan()->getDontBroadcastPlayerInputs())
 					{
 						// add msg to the historic