From 30454c9ef5fa65137c8f1ff277bdac115d2acbf4 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 13 Feb 2016 17:36:57 +0200
Subject: [PATCH] Merge with develop

---
 .../client/data/gamedev/interfaces_v3/game_context_menu.xml  | 2 +-
 code/ryzom/client/data/gamedev/interfaces_v3/guild.xml       | 2 +-
 code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml | 5 ++---
 code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml     | 2 +-
 code/ryzom/client/src/interface_v3/interface_manager.cpp     | 1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
index ecbe1b318..14ef15b80 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_context_menu.xml
@@ -20,7 +20,7 @@
 	shadow_color_grayed="0 0 0 255"
 	highlight_over="255 255 255 128"
 	formatted="true"
-	case_mode="%case_first_word_letter_up"
+	case_mode="%case_normal"
 >
 
 	<!-- Put First NPC interaction, sorted by usage frequency-->
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml b/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml
index d6b96fb30..78099815f 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml
@@ -87,7 +87,7 @@
             y="0"
             fontsize="12"
             shadow="true"
-            case_mode="%case_first_word_letter_up" />
+            case_mode="%case_normal" />
       <view type="text"
             id="grade"
             x="158"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
index f0ad3ac28..6dd1ffac5 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
@@ -521,7 +521,6 @@
 
     <view type="text"
           id="text"
-          case_mode="%case_first_word_letter_up"
           posref="TL TL"
           x="8"
           y="-8"
@@ -859,7 +858,7 @@
   <group type="menu"
          id="user_chat_emote_menu"
          extends="base_menu"
-         case_mode="%case_first_word_letter_up"
+         case_mode="%case_normal"
          on_active="lua:game:updateEmoteMenu()">
     <action id="uiEM_Wave"
             name="uiQuickEmote" />
@@ -1263,7 +1262,7 @@
               tooltip_parent="win"
               onclick_l="select_chat_target"
               params_l="menu=ui:interface:user_chat_target_menu|party_chats=false"
-              case_mode="%case_first_word_letter_up" />
+              case_mode="%case_normal" />
         <ctrl style="text_button_16"
               id="but_emote"
               posref="BR TR"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index 2a928b858..d1d6d945d 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -1702,7 +1702,7 @@
          color_grayed="255 255 255 64"
          shadow_color_grayed="0 0 0 255"
          highlight_over="255 255 255 150"
-         case_mode="%case_first_word_letter_up"></group>
+         case_mode="%case_normal"></group>
   <group type="menu"
          id="base_menu_with_color"
          extends="base_menu">
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 08137e140..b8721ffdd 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -3005,7 +3005,6 @@ void CInterfaceManager::initEmotes()
 				nbToken++;
 
 		CGroupMenu *pRootMenu = dynamic_cast<CGroupMenu*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:user_chat_emote_menu"));
-		pRootMenu->setProperty("case_mode", "0");
 		nlassert(pRootMenu);
 
 		CGroupSubMenu *pMenu = pRootMenu->getRootMenu();