Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2016-05-05 15:01:10 +03:00
commit f7f275671f
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/gui/group_html.cpp
View file

@ -50,8 +50,8 @@ using namespace std;
using namespace NLMISC; using namespace NLMISC;
// Default timeout to connect a server // Default maximum time the request is allowed to take
#define DEFAULT_RYZOM_CONNECTION_TIMEOUT (30.0) #define DEFAULT_RYZOM_CONNECTION_TIMEOUT (300.0)
// Allow up to 10 redirects, then give up // Allow up to 10 redirects, then give up
#define DEFAULT_RYZOM_REDIRECT_LIMIT (10) #define DEFAULT_RYZOM_REDIRECT_LIMIT (10)
// //

1
code/ryzom/client/data/gamedev/interfaces_v3/appzone.xml
View file

@ -212,7 +212,6 @@
background_bitmap_view="" background_bitmap_view=""
home="" home=""
browse_next_time="false" browse_next_time="false"
timeout="5"
form_text_area_group="edit_box_widget_multiline"> form_text_area_group="edit_box_widget_multiline">
<group id="black" <group id="black"
posref="BR BR" posref="BR BR"

3
code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
View file

@ -6977,8 +6977,7 @@
form_text_area_group="edit_box_widget_multiline" form_text_area_group="edit_box_widget_multiline"
browse_refresh="#browse_refresh" browse_refresh="#browse_refresh"
browse_undo="#browse_undo" browse_undo="#browse_undo"
browse_redo="#browse_redo" browse_redo="#browse_redo">
timeout="10">
<group id="black" <group id="black"
posref="BR BR" posref="BR BR"
sizeref="hw" sizeref="hw"