Merge with develop

code/ryzom/client/data/gamedev/interfaces_v3/config.xml

@@ -3318,9 +3318,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:ISDETACHED:REGION_CHAT"
             type="sint32"
             value="0" />
-  <variable entry="UI:SAVE:ISDETACHED:YUBO_CHAT"
-            type="sint32"
-            value="0" />
   <variable entry="UI:SAVE:ISENABLED:AROUND_ME"
             type="sint32"
             value="1" />
@@ -3339,9 +3336,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:ISENABLED:SYSTEM_INFO"
             type="sint32"
             value="1" />
-  <variable entry="UI:SAVE:ISENABLED:YUBO_CHAT"
-            type="sint32"
-            value="1" />
   <!-- List Menu 5 -->
   <variable entry="UI:VARIABLES:ISACTIVE:BONUS_MALUS"
             type="sint32"
@@ -3702,20 +3696,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <define id="item_type_to_item_sheet_JOB_ELEMENT"
           value="rpjob_elementary.sitem" />
   <!-- ************************ -->
-  <!-- *          YUBO CHAT               * -->
-  <!-- ************************ -->
-  <!--
-        The Yubo Chat is a special telnet chat for Game Masters, same channel as the Yubo Klient
--->
-  <variable entry="UI:VARIABLES:ISACTIVE:YUBO_CHAT"
-            type="sint32"
-            value="0" />
-  <variable entry="UI:VARIABLES:YUBO_CHAT_PRESENT"
-            type="sint32"
-            value="0" />
-  <define id="is_yubo_chat_present"
-          value="ne(@UI:VARIABLES:YUBO_CHAT_PRESENT,0)" />
-  <!-- ************************ -->
   <!-- *          DYNAMIC CHAT    * -->
   <!-- ************************ -->
   <define id="max_dyn_chan_per_player"

code/ryzom/client/data/gamedev/interfaces_v3/game_config.lua

@@ -85,6 +85,7 @@ function game:mcwOnColorChanged()
 	else
 		uiPath = uiPath .. 'pick2';
 	end
+
 	local ui = getUI(uiPath);
 	game.ColorPicker.r = ui.r;
 	game.ColorPicker.g = ui.g;

code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml

@@ -1108,23 +1108,12 @@
                 params_l="user"
                 tooltip="uittChatUser"
                 tooltip_parent="win" />
-          <ctrl style="tab_button_new"
-                id="tab6"
-                posparent="tab5"
-                group="content:cb:yubo_chat"
-                hardtext="uitabChatYuboChat"
-                onclick_r="set"
-                params_r="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=1"
-                onclick_l="chat_group_filter"
-                params_l="yubo_chat"
-                tooltip="uittChatYubo"
-                tooltip_parent="win" />
           <!-- Fixed number of dynamic chat allowed. force  _firstpos and _nextpos to have correctly aligned tab-->
           <vector template="temp_tab_dyn_chat"
                   _size="%max_dyn_chan_per_player"
                   id="tab_array0_$i"
                   nb="$i"
-                  posparent="tab6"
+                  posparent="tab5"
                   _firstpos="TR TL"
                   _nextpos="TR TL" />
           <!-- Show or hide tabs : a tab is visible if it is not filtered into the user chat AND not detached -->
@@ -1148,9 +1137,6 @@
                 target="tab4:active" />
           <link expr="not(@UI:SAVE:ISDETACHED:USER_CHAT)"
                 target="tab5:active" />
-          <link expr="and(and(%is_yubo_chat_present, @UI:SAVE:ISENABLED:YUBO_CHAT),
-                                                                not(@UI:SAVE:ISDETACHED:YUBO_CHAT))"
-                target="tab6:active" />
           <!-- Show individual chat windows if needed -->
           <link expr="and (@UI:SAVE:ISENABLED:AROUND_ME, 
                                                                 @UI:SAVE:ISDETACHED:AROUND_ME)"
@@ -1172,9 +1158,6 @@
                 target="ui:interface:system_info:active" />
           <link expr="@UI:SAVE:ISDETACHED:USER_CHAT"
                 target="ui:interface:user_chat:active" />
-          <link expr="and(and(%is_yubo_chat_present, @UI:SAVE:ISENABLED:YUBO_CHAT),
-                                                                @UI:SAVE:ISDETACHED:YUBO_CHAT)"
-                target="ui:interface:yubo_chat:active" />
         </group>
         <view type="bitmap"
               id="sep"
@@ -1248,13 +1231,6 @@
                     y="0"
                     w="0"
                     h="0" />
-          <instance template="chat_box_mainchat"
-                    id="yubo_chat"
-                    posref="TL TL"
-                    sizeref="wh"
-                    y="0"
-                    w="0"
-                    h="0" />
           <!-- Fixed number of dynamic chat allowed -->
           <vector template="chat_box_mainchat"
                   id="dyn_chat$i"
@@ -1957,10 +1933,6 @@
                 name="uiSystemInfo"
                 usergroup_l="chat_menu_button"
                 usergroup_params_l="chat_db=SYSTEM_INFO" />
-        <action id="yubo_chat"
-                name="uitabChatYuboChat"
-                usergroup_l="chat_menu_button"
-                usergroup_params_l="chat_db=YUBO_CHAT" />
         <!-- Bit of a hack as vector is not supported inside a submenu -->
         <action id="dyn0"
                 name="0"
@@ -3060,13 +3032,6 @@
 <tree node="debug_console">
 </tree>
 -->
-  <!-- ************* -->
-  <!-- * YUBO CHAT * -->
-  <!-- ************* -->
-  <proc id="yubo_chat_proc_close">
-    <action handler="set"
-            params="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=0" />
-  </proc>
   <!-- **************** -->
   <!-- * DYNAMIC CHAT * -->
   <!-- **************** -->

code/ryzom/client/data/gamedev/interfaces_v3/reset.xml

@@ -321,14 +321,12 @@
 	<action handler="set" params="dblink=UI:SAVE:ISDETACHED:USER_CHAT|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:ISDETACHED:UNIVERSE_CHAT|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:ISDETACHED:REGION_CHAT|value=0" />
-	<action handler="set" params="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:ISENABLED:AROUND_ME|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:ISENABLED:REGION_CHAT|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:ISENABLED:TEAM_CHAT|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:ISENABLED:GUILD_CHAT|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:ISENABLED:UNIVERSE_CHAT|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:ISENABLED:SYSTEM_INFO|value=1" />
-	<action handler="set" params="dblink=UI:SAVE:ISENABLED:YUBO_CHAT|value=1" />
 
 	<action handler="reset_virtual_desktop" params="vdesk=0" />
 	<action handler="reset_virtual_desktop" params="vdesk=1" />