From 9c5af189f66b23a114a500d45e956e26071ed113 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Thu, 28 Oct 2010 16:37:59 +0200
Subject: [PATCH] Changed: #1135 Merge changes from Ryzom patch 1.10 (fix a
 crash with FES)

---
 code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset | 2 +-
 code/ryzom/server/data_shard/shop_category.cfg             | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
index 5b8e98251..442a9a2cf 100644
--- a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
+++ b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
@@ -299,7 +299,7 @@
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpClan"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint32"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
diff --git a/code/ryzom/server/data_shard/shop_category.cfg b/code/ryzom/server/data_shard/shop_category.cfg
index 5f6a22241..0986b0687 100644
--- a/code/ryzom/server/data_shard/shop_category.cfg
+++ b/code/ryzom/server/data_shard/shop_category.cfg
@@ -99,6 +99,8 @@ ShopCategory = {
 		"TATOO_FEMALE",
 		"FOOD",
 		"SERVICE_STABLE",
+		"JOB_ELEMENT",
+
 
 
 	"END_ITEM_CATEGORY",	
@@ -317,6 +319,9 @@ ShopNameAliases=
 		"COMMON_TOOL: Common : TOOL: STATIC_DYNAMIC_SHOP",
 		"NEWBIELAND_TOOL : Common : TOOLS_NOOB: STATIC_DYNAMIC_SHOP", // NEW Newbieland
 
+		//job elements
+		"COMMON_JOB: Common : JOB_ELEMENT: STATIC_DYNAMIC_SHOP",
+
 		//jewel 
 		"MATIS_JEWEL: Matis: JEWEL: DYNAMIC_SHOP", 
 		"TRYKER_JEWEL: Tryker: JEWEL: DYNAMIC_SHOP",