Merge branch 'storyline/s2e0' into atys

code/ryzom/client/src/game_context_menu.cpp

@@ -458,11 +458,12 @@ void		CGameContextMenu::update()
 		if (pLeafFame != NULL)
 			fameValue = pLeafFame->getValue8();
 	}
+
 	if (_TextNews)
-		_TextNews->setActive(selection && !canAttack() && selection->isNPC() && fameValue >= -30);
+		_TextNews->setActive(!UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue >= -30);
 
 	if (_TextNewsAgressive)
-		_TextNewsAgressive->setActive(selection && !canAttack() && selection->isNPC() && fameValue < -30);
+		_TextNewsAgressive->setActive(!UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue < -30);
 
 
 	if (_TextDuel && _TextUnDuel)

code/ryzom/client/src/interface_v3/chat_window.cpp

@@ -215,7 +215,11 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 	CChatTextManager &ctm = getChatTextMngr();
 
 	gl = dynamic_cast<CGroupList *>(_Chat->getGroup("cb:text_list"));
-	if (gl)	gl->addChild(ctm.createMsgText(msg, col));
+
+	CViewBase *child = ctm.createMsgText(msg, col);
+	if (child)
+	{
+		if (gl)	gl->addChild(child);
 
 		// if the group is closed, make it blink
 		if (!_Chat->isOpen())
@@ -239,6 +243,7 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 			(*it)->displayMessage(this, msg, col, numBlinks);
 		}*/
 	}
+}
 
 //=================================================================================
 void CChatWindow::setMenu(const std::string &menuName)
@@ -563,13 +568,18 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 	ucstring newmsg = msg;
 	ucstring prefix;
 
+	CViewBase *child = NULL;
 	if (gl != NULL)
 	{
-		gl->addChild(ctm.createMsgText(newmsg, col));
+		child = ctm.createMsgText(newmsg, col);
+		if (child)
+		{
+			gl->addChild(child);
 			if (!gl->getParent()->getActive())
 				if (tab != NULL)
 					tab->setTextColorNormal(newMsgColor);
 		}
+	}
 
 	// *** Display the message in the UserChat (special case)
 	{
@@ -635,14 +645,19 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 
 		if (gl != NULL)
 		{
-			gl->addChild(ctm.createMsgText(newmsg, col));
+			child = ctm.createMsgText(newmsg, col);
+			if (child)
+			{
+				gl->addChild(child);
 				if (!gl->getParent()->getActive())
 					if (tab != NULL)
 						tab->setTextColorNormal(newMsgColor);
 			}
 		}
+	}
 
-
+	if (child)
+	{
 		// *** Blink and visibility event
 		// if the group is closed, make it blink
 		if (!_Chat->isOpen())
@@ -662,6 +677,7 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 			*windowVisible = isVisible();
 		}
 	}
+}
 
 //=================================================================================
 void CChatGroupWindow::displayTellMessage(const ucstring &msg, NLMISC::CRGBA col, const ucstring &sender)
@@ -685,8 +701,9 @@ void CChatGroupWindow::displayTellMessage(const ucstring &msg, NLMISC::CRGBA col
 		nlwarning("<CChatGroupWindow::displayTellMessage> can't get text_list.");
 		return;
 	}
-
-	gl->addChild(getChatTextMngr().createMsgText(msg, col));
+	CViewBase *child = getChatTextMngr().createMsgText(msg, col);
+	if (child)
+		gl->addChild(child);
 }
 
 //=================================================================================

code/ryzom/client/src/interface_v3/people_list.cpp

@@ -480,7 +480,10 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 	ucstring s = CI18N::get("youTellPlayer");
 	strFindReplace(s, "%name", receiver);
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
-	gl->addChild(getChatTextMngr().createMsgText(finalMsg, prop.getRGBA()));
+	CViewBase *child = getChatTextMngr().createMsgText(finalMsg, prop.getRGBA());
+	if (child)
+	{
+		gl->addChild(child);
 		CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
 
 		// if the group is closed, make it blink
@@ -493,6 +496,7 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 			_BaseContainer->enableBlink(numBlinks);
 		}
 	}
+}
 
 
 //==================================================================
@@ -539,8 +543,9 @@ void CPeopleList::displayMessage(uint index, const ucstring &msg, NLMISC::CRGBA
 		nlwarning("<CPeopleList::displayMessage> can't get text_list.");
 		return;
 	}
-
-	gl->addChild(getChatTextMngr().createMsgText(msg, col));
+	CViewBase *child = getChatTextMngr().createMsgText(msg, col);
+	if (child)
+		gl->addChild(child);
 }