From 32e22ab2081c443cc1a15a16a26e4f6b15416913 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Wed, 4 May 2016 10:06:29 +0200
Subject: [PATCH 1/3] Changed: Simplify CMake end tags

--HG--
branch : develop
---
 code/CMakeModules/FindLuabind.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/CMakeModules/FindLuabind.cmake b/code/CMakeModules/FindLuabind.cmake
index 64fd5e1cf..c21d64e4f 100644
--- a/code/CMakeModules/FindLuabind.cmake
+++ b/code/CMakeModules/FindLuabind.cmake
@@ -124,7 +124,7 @@ IF(WITH_LUA51)
   IF(WITH_STLPORT)
     LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua51)
     LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua51d)
-  ENDIF(WITH_STLPORT)
+  ENDIF()
 
   LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua51)
   LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua51d)
@@ -134,7 +134,7 @@ IF(WITH_LUA50)
   IF(WITH_STLPORT)
     LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua50)
     LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua50d)
-  ENDIF(WITH_STLPORT)
+  ENDIF()
 
   LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua50)
   LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua50d)
@@ -195,7 +195,7 @@ IF(LUABIND_INCLUDE_DIR AND Boost_INCLUDE_DIR)
     SET(LUABIND_FOUND TRUE)
     SET(LUABIND_LIBRARIES ${LUABIND_LIBRARY_DEBUG})
   ENDIF(LUABIND_LIBRARY_RELEASE AND LUABIND_LIBRARY_DEBUG)
-ENDIF(LUABIND_INCLUDE_DIR AND Boost_INCLUDE_DIR)
+ENDIF()
 
 IF(LUABIND_FOUND)
   SET(LUABIND_INCLUDE_DIR ${LUABIND_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
@@ -203,17 +203,17 @@ IF(LUABIND_FOUND)
   FIND_FILE(LUABIND_VERSION_FILE luabind/version.hpp PATHS ${LUABIND_INCLUDE_DIR})
   IF(LUABIND_VERSION_FILE)
     SET(LUABIND_DEFINITIONS "-DHAVE_LUABIND_VERSION")
-  ENDIF(LUABIND_VERSION_FILE)
+  ENDIF()
 
   FIND_CORRECT_LUA_VERSION()
 
   IF(NOT Luabind_FIND_QUIETLY)
     MESSAGE(STATUS "Found Luabind: ${LUABIND_LIBRARIES}")
   ENDIF(NOT Luabind_FIND_QUIETLY)
-ELSE(LUABIND_FOUND)
+ELSE()
   IF(NOT Luabind_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Luabind!")
-  ENDIF(NOT Luabind_FIND_QUIETLY)
+  ENDIF()
 ENDIF(LUABIND_FOUND)
 
 MARK_AS_ADVANCED(LUABIND_LIBRARY_RELEASE LUABIND_LIBRARY_DEBUG Boost_LIB_DIAGNOSTIC_DEFINITIONS)

From 99b87b1128d0288f094c9f666624d96f26607659 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Wed, 4 May 2016 10:07:03 +0200
Subject: [PATCH 2/3] Changed: Update interfaces files with patchlet version

--HG--
branch : develop
---
 .../data/gamedev/interfaces_v3/inventory.xml  | 182 +++++++++++++++++-
 .../data/gamedev/interfaces_v3/webig.lua      |   2 +-
 2 files changed, 182 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml b/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
index 9c4b259da..b298467b1 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
@@ -27,6 +27,15 @@
     <!-- Yoyo: prefer show an empty list when clicking -->
     <!-- <action handler="leave_modal" cond="eq(getprop('ui:interface:bag_choose:list:nbelt'),0)" /> -->
   </proc>
+  <proc id="select_special_items">
+      <action handler="set" params="target_property=ui:interface:inventory:content:bag:iil:active|value=0" />
+      <action handler="set" params="target_property=ui:interface:inventory:content:bag:webitems:active|value=1" />
+      <action handler="browse_home" params="name=ui:interface:inventory:content:bag:webitems:html" />
+  </proc>
+  <proc id="select_bag_items">
+      <action handler="set" params="target_property=ui:interface:inventory:content:bag:iil:active|value=1" />
+      <action handler="set" params="target_property=ui:interface:inventory:content:bag:webitems:active|value=0" />
+  </proc>
   <!-- ************* -->
   <!-- * EQUIPMENT * -->
   <!-- ************* -->
@@ -44,6 +53,83 @@
          onclick_l="proc"
          params_l="inv_left_click_on_slot"
          auto_grayed="false" />
+
+  <template name="img_button"
+            id="image_button"
+            ok_text="uittOK"
+            tx_over="blank.tga"
+            cancel_text="uittCancel"
+            posparent="parent"
+            posref="BM TM"
+            onclick_ok=""
+            onclick_ok_param=""
+            x="0"
+            y="0"
+            keep="true"
+            tooltip_ok=""
+            avoid_resize_parent="false">
+    <group id="#id"
+           posparent="#posparent"
+           posref="#posref"
+           child_resize_w="true"
+           child_resize_h="true"
+           x="#x"
+           y="#y"
+           avoid_resize_parent="#avoid_resize_parent">
+      <ctrl style="button_ok"
+            id="bb"
+            x="0"
+            y="0"
+            posref="TL TL"
+            text_y="-2"
+            onclick_l="#onclick_ok"
+            params_l="#onclick_ok_param"
+            hardtext="#ok_text"
+            tooltip="#tooltip_ok" />
+      <ctrl type="button"
+            id="button"
+            button_type="push_button"
+            posref="TL TL"
+            x="0"
+            y="0"
+            scale="false"
+            tx_over="#tx_over"
+            color="255 255 255 255"
+            col_pushed="255 255 255 255"
+            col_over="255 255 255 0"
+            onclick_l="#onclick_ok"
+            params_l="#onclick_ok_param" />
+    </group>
+  </template>
+
+  <template name="image_button"
+      tx_over="blank.tga"
+      onclick_l=""
+      params_l=""  >
+    <group id="#id"
+           posref="TL TL"
+           x="0"
+           y="0"
+           sizeref="wh"
+           w="0"
+           h="0">
+      <ctrl type="button"
+            id=""
+            button_type="push_button"
+            posref=""
+            posparent=""
+            x=""
+            y=""
+            scale="false"
+            tx_over="#tx_over"
+            color="255 255 255 255"
+            col_pushed="255 255 255 255"
+            col_over="255 255 255 0"
+            onclick_l="#onclick_l"
+            params_l="#params_l" />
+    </group>
+  </template>
+
   <!-- For the moment we use a template because we have to make the fake container -->
   <template name="tinv_equip">
     <group id="equip"
@@ -481,6 +567,7 @@
            posref="TL TL"
            group_onclick_r="active_menu"
            group_params_r="menu=ui:interface:base_menu_with_color">
+
       <group type="tab"
              id="inv_select"
              child_resize_w="true"
@@ -624,6 +711,99 @@
              sizeref="wh"
              w="0"
              h="0">
+        <!-- Special Items -->
+        <ctrl style="text_button_16"
+          id="bag_items"
+          posref="TL TL"
+          y="-2"
+          x="10"
+          wmargin="8"
+          hardtext="uitabInvBag"
+          tooltip="uitabInvBag"
+          onclick_l="proc"
+          params_l="select_bag_items" />
+        <ctrl style="text_button_16"
+          id="special_items"
+          posref="TR TL"
+          posparent="bag_items"
+          y="0"
+          x="2"
+          wmargin="8"
+          hardtext="uiSpecialLabo"
+          tooltip="uiSpecialLabo"
+          onclick_l="proc"
+          params_l="select_special_items" />
+        <!-- Keys 
+        <ctrl style="text_button_16"
+          id="keys"
+          posref="TR TL"
+          posparent="special_items"
+          y="0"
+          x="2"
+          wmargin="8"
+          hardtext="Keys"
+          tooltip="uiSpecialLabo"
+          onclick_l="open_title_help"
+          params_l="from=user" />-->
+
+        <group id="webitems" posref="TL TL" sizeref="wh" h="-40" w="0" x="0" y="-18" active="0">
+          <group type="webig_html"
+             id="html"
+             url="http://app.ryzom.com/app_arcc/index.php?action=mItem_DisplayUserItems"
+             title_prefix=""
+             sizeref="wh"
+             x="10"
+             y="0"
+             w="0"
+             h="0"
+             background_color="0 0 0 255"
+             error_color="255 240 48 255"
+             link_color="240 155 100 255"
+             text_color="210 210 210 255"
+             h1_color="255 255 255 255"
+             h2_color="255 255 255 255"
+             h3_color="255 255 255 255"
+             h4_color="255 255 255 255"
+             h5_color="255 255 255 255"
+             h6_color="100 255 100 255"
+             text_font_size="10"
+             h1_font_size="20"
+             h2_font_size="18"
+             h3_font_size="16"
+             h4_font_size="14"
+             h5_font_size="12"
+             h6_font_size="10"
+             paragraph_begin_space="1"
+             multi_line_space_factor="0.25"
+             td_begin_space="16"
+             li_begin_space="4"
+             ul_begin_space="12"
+             li_indent="0"
+             ul_indent="30"
+             checkbox_bitmap_normal="w_slot_on.tga"
+             checkbox_bitmap_pushed="w_opacity_on.tga"
+             checkbox_bitmap_over=""
+             background_bitmap_view="black2"
+             home="http://app.ryzom.com/app_arcc/index.php?action=mItem_DisplayUserItems"
+             browse_next_time="true"
+             form_text_area_group="edit_box_widget_multiline">
+          <group type="list"
+                 id="text_list"
+                 fontsize="9"
+                 posref="TL TL"
+                 posparent="black"
+                 x="9"
+                 y="-2"
+                 space="0"
+                 sizeref="hw"
+                 w="-4"
+                 h="-4"
+                 maxelements="2000" />
+          <ctrl style="skin_scroll"
+                id="scroll_bar" />
+         </group>
+       </group>
+
         <instance template="tinv_nbslots_bulk_weight"
                   id="ibw"
                   x="0"
@@ -632,7 +812,7 @@
         <instance template="tinv_item_list"
                   id="iil"
                   inv_branch_nb="%max_bag_invslot"
-                  y="-16"
+                  y="-18"
                   sizeref="wh"
                   h="-16"
                   inv_branch="%bag"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua b/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua
index 516cc62d7..10c489ca4 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua
@@ -176,7 +176,7 @@ function webig:doRemoveDbSheetQuantity(sheet_list, ctrl)
 	if new_quantity >= current_quantity then
 		webig:deleteItem(db..":"..ctrl)
 	else
-		addDbProp(db..":"..ctrl..":QUANTITY", current_quantity-new_quantity)
+		addDbProp(db..":"..ctrl..":QUANTITY", new_quantity)
 	end
 end
 

From 77ae602e6a6bbb046aa928d73468dbc724f8aee2 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Wed, 4 May 2016 10:07:42 +0200
Subject: [PATCH 3/3] Changed: Better alignment

--HG--
branch : develop
---
 .../ryzom/server/src/shard_unifier_service/chat_unifier.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/server/src/shard_unifier_service/chat_unifier.cpp b/code/ryzom/server/src/shard_unifier_service/chat_unifier.cpp
index e4c52f4a2..6c3a188e5 100644
--- a/code/ryzom/server/src/shard_unifier_service/chat_unifier.cpp
+++ b/code/ryzom/server/src/shard_unifier_service/chat_unifier.cpp
@@ -225,7 +225,7 @@ namespace CHATUNI
 			{
 				// no IOS for the hosting shard !
 				cucSender.recvFarTellFail(this, senderCharId, destName, TFailInfo::fi_no_ios_module);
-nldebug("sendFatTell : no module proxy for shard %u", hostShardId);
+				nldebug("sendFatTell : no module proxy for shard %u", hostShardId);
 				return;
 			}
 
@@ -235,7 +235,7 @@ nldebug("sendFatTell : no module proxy for shard %u", hostShardId);
 			{
 				// no character synchronizer to retrieve sender name !
 				cucSender.recvFarTellFail(this, senderCharId, destName, TFailInfo::fi_no_char_sync);
-nldebug("sendFarTell : can't finc character sync singleton");
+				nldebug("sendFarTell : can't finc character sync singleton");
 				return;
 			}
 
@@ -245,7 +245,7 @@ nldebug("sendFarTell : can't finc character sync singleton");
 			{
 				// no character synchronizer to retrieve sender name !
 				cucSender.recvFarTellFail(this, senderCharId, destName, TFailInfo::fi_sender_char_unknown);
-nldebug("sendFarTell : can't get character name from sender char id %s", senderCharId.toString().c_str());
+				nldebug("sendFarTell : can't get character name from sender char id %s", senderCharId.toString().c_str());
 				return;
 			}