From 4158e851a90f842bea2a8449f55a43d1a1fe9c11 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 10 Jan 2016 16:34:13 +0200
Subject: [PATCH] Merge with develop

---
 code/nel/src/gui/group_html.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index b4cadc3f4..40dead326 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -2274,12 +2274,16 @@ namespace NLGUI
 			case HTML_DD:
 				if (!_DL.empty())
 				{
-					if (_Indent > ULIndent)
-						_Indent = _Indent - ULIndent;
-					else
-						_Indent = 0;
+					// 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;
+						else
+							_Indent = 0;
 
-					_DL.back().DD = false;
+						_DL.back().DD = false;
+					}
 				}
 				break;
 			case HTML_SPAN:
@@ -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";
+				}
 			}
 		}