Merge branch 'storyline/s2e0' into yubo

code/nel/src/misc/system_info.cpp

@@ -188,6 +188,7 @@
 #	endif // NL_CPU_INTEL
 #	ifdef NL_OS_MAC
 #		include <sys/mount.h>
+#		include <sys/sysctl.h>
 #	else
 #		include <sys/vfs.h>
 #	endif

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

@@ -216,7 +216,7 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 
 	gl = dynamic_cast<CGroupList *>(_Chat->getGroup("cb:text_list"));
 
-	
+
 
 	bool noTranslation = false;
 	CCDBNodeLeaf *nodeNoTranslation = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:TRANSLATION:" + toUpper(CChatGroup::groupTypeToString(gt)) + ":DISABLE", false);
@@ -233,7 +233,7 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 			msgNoTranslate = msg.substr(0, startTr) + msg.substr(startTr+5, endOfOriginal-startTr-5);
 		}
 	}
-	
+
 	CViewBase *child = ctm.createMsgText(msgNoTranslate, col);
 	if (child)
 	{
@@ -586,8 +586,10 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 	ucstring newmsg = msg;
 	ucstring prefix;
 
+	bool noTranslation = false;
 	CCDBNodeLeaf *nodeNoTranslation = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:TRANSLATION:" + toUpper(CChatGroup::groupTypeToString(gt)) + ":DISABLE", false);
-	bool noTranslation = nodeNoTranslation->getValueBool();
+	if (nodeNoTranslation)
+		noTranslation = nodeNoTranslation->getValueBool();
 
 	if (noTranslation) {
 		string::size_type startTr = msg.find(ucstring("{:"));

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

@@ -1139,10 +1139,8 @@ void CDBCtrlSheet::infoReceived()
 			const CSBrickSheet *brick = pBM->getBrick(itemInfo->Enchantment.Bricks[i]);
 			if (brick)
 			{
-				if (!brick->isRoot() && !brick->isCredit() && !brick->isParameter())
 				if (brick->BrickFamily == BRICK_FAMILIES::BSGMCB) // Boost of Allegories, use it as boost icon
 				{
-					if (!haveRoot)
 					_BoostIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIcon()), brick->IconColor));
 					rVR.getTextureSizeFromId(_BoostIcons.back().TextureId, _BoostIcons.back().IconW, _BoostIcons.back().IconH);
 				}