Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/gui/group_html.cpp

@@ -2273,6 +2273,9 @@ namespace NLGUI
 				break;
 			case HTML_DD:
 				if (!_DL.empty())
+				{
+					// parser will process two DD in a row as nested when first DD is not closed
+					if (_DL.back().DD)
 					{
 						if (_Indent > ULIndent)
 							_Indent = _Indent - ULIndent;
@@ -2281,6 +2284,7 @@ namespace NLGUI
 
 						_DL.back().DD = false;
 					}
+				}
 				break;
 			case HTML_SPAN:
 				popIfNotEmpty (_FontSize);
@@ -3843,7 +3847,7 @@ namespace NLGUI
 				uint32 w, h;
 				CBitmap::loadSize (image, w, h);
 				if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
-					image.clear();
+					image = "web_del.tga";
 			}
 			else
 			{
@@ -3988,6 +3992,13 @@ namespace NLGUI
 					normal = "web_del.tga";
 					addImageDownload(normalBitmap, ctrlButton, style);
 				}
+				else
+				{
+					uint32 w, h;
+					CBitmap::loadSize(normal, w, h);
+					if (w == 0 || h == 0)
+						normal = "web_del.tga";
+				}
 			}
 		}