From 3530beb7feaa157c4fb2bdffc36772cb52f24259 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 5 May 2016 15:01:10 +0300
Subject: [PATCH] Merge with develop

---
 code/nel/src/gui/group_html.cpp                          | 4 ++--
 code/ryzom/client/data/gamedev/interfaces_v3/appzone.xml | 1 -
 code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index 2c225b3ce..63bbfc457 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -50,8 +50,8 @@ using namespace std;
 using namespace NLMISC;
 
 
-// Default timeout to connect a server
-#define DEFAULT_RYZOM_CONNECTION_TIMEOUT (30.0)
+// Default maximum time the request is allowed to take
+#define DEFAULT_RYZOM_CONNECTION_TIMEOUT (300.0)
 // Allow up to 10 redirects, then give up
 #define DEFAULT_RYZOM_REDIRECT_LIMIT (10)
 //
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/appzone.xml b/code/ryzom/client/data/gamedev/interfaces_v3/appzone.xml
index c6f08c3b2..51bc04178 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/appzone.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/appzone.xml
@@ -212,7 +212,6 @@
              background_bitmap_view=""
              home=""
              browse_next_time="false"
-             timeout="5"
              form_text_area_group="edit_box_widget_multiline">
         <group id="black"
                posref="BR BR"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index b806edb8d..5234846f1 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -6977,8 +6977,7 @@
            form_text_area_group="edit_box_widget_multiline"
            browse_refresh="#browse_refresh"
            browse_undo="#browse_undo"
-           browse_redo="#browse_redo"
-           timeout="10">
+           browse_redo="#browse_redo">
       <group id="black"
              posref="BR BR"
              sizeref="hw"