From 5e7799f0895b6b100c1c25935fed6f2067e45dc1 Mon Sep 17 00:00:00 2001
From: Riasan <riasan@ryzom.com>
Date: Sun, 22 Jul 2018 16:42:26 +0200
Subject: [PATCH 1/3] Fixed: text height, window size , Vendor markup exploit
 for resale

--HG--
branch : compatibility-develop
---
 .../gamedev/interfaces_v3/bot_chat_v4.xml     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
index 7d3364899..433dca752 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
@@ -1576,7 +1576,7 @@
             posparent="box1"
             posref="MR MR"
             x="-3"
-            y="-2"
+            y="0"
             color="135 243 28 255"
             shadow="true"
             fontsize="10"
@@ -1632,7 +1632,7 @@
             posparent="box1"
             posref="MR MR"
             x="-3"
-            y="-2"
+            y="0"
             color="135 243 28 255"
             shadow="true"
             fontsize="10"
@@ -1646,9 +1646,9 @@
   <group id="bot_chat_buy_sell_item"
          type="container"
          posref="BL TL"
-         min_w="408"
-         max_w="408"
-         w="408"
+         min_w="450"
+         max_w="450"
+         w="450"
          x="332"
          y="200"
          pop_max_h="700"
@@ -1974,7 +1974,7 @@
                       posref="TR ML"
                       text_x="0"
                       text_ref="BR BR"
-                      w="42"
+                      w="44"
                       prompt="+"
                       enter_loose_focus="true"
                       multi_line="false"
@@ -1984,7 +1984,7 @@
                       reset_focus_on_hide="true"
                       max_historic="0"
                       entry_type="positive_integer"
-                      max_num_chars="5" />
+                      max_num_chars="4" />
             <view type="text"
                   id="pct"
                   posparent="edit"
@@ -2316,7 +2316,7 @@
             y="0"
             posparent="confirm_trade"
             posref="ML MR"
-            text_y="-2"
+            text_y="0"
             onclick_l="confirm_trade"
             params_l="resale=1"
             hardtext="uiLetResell" />
@@ -2511,7 +2511,7 @@
     <group type="list_sheet_trade"
            sizeref="w"
            w="0"
-           x="2"
+           x="4"
            y="0"
            h="%trade_slot_height"
            id="#id"
@@ -2520,7 +2520,7 @@
            xitem="2"
            yitem="-2"
            xtext="46"
-           ytext="-2"
+           ytext="2"
            hspace="4"
            array="false"
            value="%trade"

From adb3362b449de84b1d5b897d23775c44faf6bd3a Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sun, 22 Jul 2018 18:37:44 +0200
Subject: [PATCH 2/3] Changed: Always compile ryzom_gameshare if WITH_RYZOM is
 defined

--HG--
branch : develop
---
 code/ryzom/common/CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/ryzom/common/CMakeLists.txt b/code/ryzom/common/CMakeLists.txt
index 00eec3097..82e5030a7 100644
--- a/code/ryzom/common/CMakeLists.txt
+++ b/code/ryzom/common/CMakeLists.txt
@@ -1,7 +1,4 @@
-# only compile game_share for Ryzom client, server and tools
-IF(WITH_RYZOM_CLIENT OR WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS)
-  ADD_SUBDIRECTORY(src)
-ENDIF()
+ADD_SUBDIRECTORY(src)
 
 #ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/share/data_common.bnp"
 #  COMMAND bnp_make -p ${CMAKE_CURRENT_SOURCE_DIR}/data_common ${CMAKE_BINARY_DIR}/share > /dev/null)

From 30bbcb234566116be3c35b9192f1820061c78041 Mon Sep 17 00:00:00 2001
From: Riasan <riasan@ryzom.com>
Date: Mon, 23 Jul 2018 20:16:28 +0200
Subject: [PATCH 3/3] Fixed: overflow header text, quantity input size

--HG--
branch : compatibility-develop
---
 .../client/data/gamedev/interfaces_v3/bot_chat_v4.xml      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
index 433dca752..785222608 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
@@ -1653,6 +1653,7 @@
          y="200"
          pop_max_h="700"
          max_h="2000"
+         title_delta_max_w="-40"
          active="false"
          openable="false"
          opened="true"
@@ -1736,14 +1737,14 @@
                posref="BL TL"
                x="0"
                y="1"
-               w="42"
+               w="46"
                child_resize_h="true">
           <view type="text"
                 id="cross"
                 posref="ML ML"
                 color="255 255 255 255"
                 fontsize="10"
-                x="1"
+                x="0"
                 y="-3"
                 shadow="true"
                 hardtext="X" />
@@ -1753,7 +1754,7 @@
                     x="-6"
                     text_x="0"
                     text_ref="BR BR"
-                    w="26"
+                    w="30"
                     prompt=""
                     enter_loose_focus="true"
                     multi_line="false"