Merge with develop

--HG--
branch : compatibility-develop

code/nel/include/nel/gui/libwww.h

@@ -208,6 +208,7 @@ namespace NLGUI
 			HTML_ATTR(P,QUICK_HELP_EVENTS),
 			HTML_ATTR(P,QUICK_HELP_LINK),
 			HTML_ATTR(P,NAME),
+			HTML_ATTR(P,STYLE),
 	};
 
 	enum

code/nel/src/gui/group_html.cpp

@@ -2281,8 +2281,8 @@ namespace NLGUI
 				{
 					newParagraph(PBeginSpace);
 					pushStyle();
-					if (present[HTML_BLOCK_STYLE] && value[HTML_BLOCK_STYLE])
+					if (present[MY_HTML_P_STYLE] && value[MY_HTML_P_STYLE])
-						getStyleParams(value[HTML_BLOCK_STYLE], _Style);
+						getStyleParams(value[MY_HTML_P_STYLE], _Style);
 				}
 				break;
 			case HTML_PRE:

code/nel/src/gui/libwww.cpp

@@ -213,6 +213,7 @@ namespace NLGUI
 			HTML_ATTR(P,QUICK_HELP_EVENTS),
 			HTML_ATTR(P,QUICK_HELP_LINK),
 			HTML_ATTR(P,NAME),
+			HTML_ATTR(P,STYLE),
 		{ 0 }
 	};