From 0be0a1e9e70eb856cb76cffd28197fa4665d1332 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 23 Jul 2016 11:28:22 +0300
Subject: [PATCH] Merge with develop

---
 code/nel/src/gui/group_html.cpp                        |  1 -
 .../data/gamedev/interfaces_v3/out_v2_appear.xml       | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index 60146e484..964610149 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -4387,7 +4387,6 @@ namespace NLGUI
 			ctrlButton->setToolTipParent(TTMouse);
 			ctrlButton->setToolTipParentPosRef(Hotspot_TTAuto);
 			ctrlButton->setToolTipPosRef(Hotspot_TTAuto);
-			ctrlButton->setActionOnLeftClickParams(tooltip);
 		}
 
 		getParagraph()->addChild (ctrlButton);
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
index 23b31ccaa..c1e3d736b 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
@@ -1740,7 +1740,7 @@
 </proc>
 
 
-<group type="modal" id="appear_infos1" x="0" y="0" w="824" h="768" posref="TR TR" render_layer="1"
+<group type="modal" id="appear_infos1" x="74" y="0" w="824" h="768" posref="MM MM" render_layer="1"
 					mouse_pos="false" escapable="false" exit_click_out="true" savable="false"
  display="false"
 >
@@ -1765,7 +1765,7 @@
 					onclick_l="proc" params_l="proc_charsel_infos"/>
 </group>
 
-<group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
+<group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
 					mouse_pos="false" escapable="false" exit_click_out="true"
  display="false"
 >
@@ -1778,7 +1778,7 @@
 					onclick_l="proc" params_l="proc_charsel_infos"/>
 </group>
 
-<group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
+<group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
 					mouse_pos="false" escapable="false" exit_click_out="true"
 	display="false"
 >
@@ -1791,7 +1791,7 @@
 					onclick_l="proc" params_l="proc_charsel_infos"/>
 </group>
 
-<group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
+<group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
 					mouse_pos="false" escapable="false" exit_click_out="true"
 					display="false"
 >
@@ -1804,7 +1804,7 @@
 					onclick_l="proc" params_l="proc_charsel_infos"/>
 </group>
 
-<group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
+<group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
 					mouse_pos="false" escapable="false" exit_click_out="true"
 					display="false"
 >