diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h
index 675d2c20e..bdec4009e 100644
--- a/code/nel/include/nel/gui/group_html.h
+++ b/code/nel/include/nel/gui/group_html.h
@@ -64,8 +64,10 @@ namespace NLGUI
std::string languageCode;
/// List of domains the widget can consider secure.
std::vector< std::string > trustedDomains;
+ /// Maximum concurrent MultiCurl connections per CGroupHTML instance
+ sint32 curlMaxConnections;
- SWebOptions()
+ SWebOptions(): curlMaxConnections(2)
{
}
};
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index f2df454cb..f2d3f826b 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -2090,6 +2090,11 @@ namespace NLGUI
clearContext();
MultiCurl = curl_multi_init();
+ if (MultiCurl)
+ {
+ curl_multi_setopt(MultiCurl, CURLMOPT_MAX_HOST_CONNECTIONS, options.curlMaxConnections);
+ curl_multi_setopt(MultiCurl, CURLMOPT_PIPELINING, 1);
+ }
RunningCurls = 0;
_CurlWWW = NULL;
diff --git a/code/nel/src/gui/view_text.cpp b/code/nel/src/gui/view_text.cpp
index 0e3b420a0..1ccd0ec71 100644
--- a/code/nel/src/gui/view_text.cpp
+++ b/code/nel/src/gui/view_text.cpp
@@ -42,6 +42,8 @@ namespace NLGUI
// ***************************************************************************
void CViewText::setupDefault ()
{
+ _ParentElm = NULL;
+
_CaseMode = CaseNormal;
_Underlined = false;
_StrikeThrough = false;
@@ -2650,6 +2652,10 @@ namespace NLGUI
void CViewText::onInvalidateContent()
{
_InvalidTextContext= true;
+
+ if (_ParentElm)
+ _ParentElm->invalidateCoords();
+
invalidateCoords();
}
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 7c964904b..20bf5362d 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -429,6 +429,8 @@ CClientConfig::CClientConfig()
WebIgMainDomain = "shard.ryzomcore.org";
WebIgTrustedDomains.push_back(WebIgMainDomain);
+ CurlMaxConnections = 2;
+
RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php";
ReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes/index.php";
@@ -1074,6 +1076,9 @@ void CClientConfig::setValues()
// WEBIG //
READ_STRING_FV(WebIgMainDomain);
READ_STRINGVECTOR_FV(WebIgTrustedDomains);
+ READ_INT_FV(CurlMaxConnections);
+ if (ClientCfg.CurlMaxConnections < 0)
+ ClientCfg.CurlMaxConnections = 2;
///////////////
// ANIMATION //
diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h
index 7d7f1c65d..41b716d2d 100644
--- a/code/ryzom/client/src/client_cfg.h
+++ b/code/ryzom/client/src/client_cfg.h
@@ -304,6 +304,7 @@ struct CClientConfig
std::string WebIgMainDomain;
std::vector WebIgTrustedDomains;
+ sint32 CurlMaxConnections;
///////////////
// ANIMATION //
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 29833d4ff..144b6286f 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -469,6 +469,7 @@ CInterfaceManager::CInterfaceManager()
CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
CGroupHTML::options.appName = getUserAgentName();
CGroupHTML::options.appVersion = getUserAgentVersion();
+ CGroupHTML::options.curlMaxConnections = ClientCfg.CurlMaxConnections;
NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();