Merge branch 'atys' into atys-live

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

@@ -1139,19 +1139,27 @@ 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);
 				}
 				else if (!brick->isRoot() && !brick->isCredit() && !brick->isParameter())
 				{
-					if (!haveRoot && !brick->getIconBack().empty())
+					if (!haveRoot)
 					{
-						_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIconBack()), brick->IconBackColor));
-						rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);
+						haveRoot = true;
+						if (brick->getIconBack().empty())
+						{
+							// use blank texture with size from main icon
+							_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName("blank.tga"), NLMISC::CRGBA::White));
+							rVR.getTextureSizeFromId(rVR.getTextureIdFromName(brick->getIcon()), _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);
+						}
+						else
+						{
+							_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIconBack()), brick->IconBackColor));
+							rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);
+						}
 					}
 					_EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIcon()), brick->IconColor));
 					rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);

code/ryzom/client/src/user_entity.cpp

@@ -2674,17 +2674,6 @@ void CUserEntity::selection(const CLFECOMMON::TCLEntityId &slot)	// virtual
 		{
 			playerGiftNeeded->setValue32(0);
 		}
-		//
-		missionOption = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%d:TITLE", (int) k), false);
-		if (missionOption)
-		{
-			missionOption->setValue32(0);
-		}
-		playerGiftNeeded = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%d:PLAYER_GIFT_NEEDED", (int) k), false);
-		if (playerGiftNeeded)
-		{
-			playerGiftNeeded->setValue32(0);
-		}
 	}
 /* TODO ULU : Add RP tags */