From 23cf0e3e924d8c4a996744c91de05be8fb561de7 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 11 Jan 2011 13:42:15 +0100
Subject: [PATCH] Changed: #1230 Fix for duplicate ma_cheveux01.(s)item and
 ma_cheveux02.(s)item

---
 .../leveldesign/Game_elem/CreatePerso/matis.race_stats   | 4 ++--
 .../Npc/parent/_basics_3D/_matis_female.creature         | 9 ---------
 .../Creature/Npc/parent/_basics_3D/_matis_male.creature  | 9 ---------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/CreatePerso/matis.race_stats b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/CreatePerso/matis.race_stats
index dc51203f2..5563b0fbf 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/CreatePerso/matis.race_stats
+++ b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/CreatePerso/matis.race_stats
@@ -32,7 +32,7 @@
         <ATOM Name="DefaultLegs" Value="igmpu.sitem"/>
         <ATOM Name="DefaultHands" Value="igmgu.sitem"/>
         <ATOM Name="DefaultFeet" Value="igmbu.sitem"/>
-        <ATOM Name="DefaultHair" Value="ma_cheveux01.sitem"/>
+        <ATOM Name="DefaultHair" Value="ma_cheveux_short01.sitem"/>
         <ATOM Name="MorphTargetMin0" Value="-70"/>
         <ATOM Name="MorphTargetMin1" Value="-70"/>
         <ATOM Name="MorphTargetMin2" Value="-75"/>
@@ -56,7 +56,7 @@
         <ATOM Name="DefaultLegs" Value="igmpu.sitem"/>
         <ATOM Name="DefaultHands" Value="igmgu.sitem"/>
         <ATOM Name="DefaultFeet" Value="igmbu.sitem"/>
-        <ATOM Name="DefaultHair" Value="ma_cheveux01.sitem"/>
+        <ATOM Name="DefaultHair" Value="ma_cheveux_short01.sitem"/>
         <ATOM Name="MorphTargetMin0" Value="-80"/>
         <ATOM Name="MorphTargetMin1" Value="-45"/>
         <ATOM Name="MorphTargetMin2" Value="-30"/>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_female.creature b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_female.creature
index a297fa72f..dd7ab705a 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_female.creature
+++ b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_female.creature
@@ -5,15 +5,6 @@
     <STRUCT Name="Basics">
       <ATOM Name="Race" Value="matis"/>
       <ATOM Name="Gender" Value="Female"/>
-      <STRUCT Name="Equipment">
-        <STRUCT Name="Head">
-          <ATOM Name="Item" Value="ma_cheveux01.item"/>
-        </STRUCT>
-        <STRUCT Name="Face">
-          <ATOM Name="Item" Value="ma_VISAGE.item"/>
-          <ATOM Name="Texture" Value="Lacustre/Low Quality/Young"/>
-        </STRUCT>
-      </STRUCT>
       <STRUCT Name="MovementSpeeds">
         <ATOM Name="WalkSpeed" Value="1.66"/>
       </STRUCT>
diff --git a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_male.creature b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_male.creature
index 19965fc2b..eea79fb0d 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_male.creature
+++ b/code/ryzom/common/data_leveldesign/leveldesign/Game_elem/Creature/Npc/parent/_basics_3D/_matis_male.creature
@@ -4,15 +4,6 @@
   <STRUCT>
     <STRUCT Name="Basics">
       <ATOM Name="Race" Value="matis"/>
-      <STRUCT Name="Equipment">
-        <STRUCT Name="Head">
-          <ATOM Name="Item" Value="ma_cheveux01.item"/>
-        </STRUCT>
-        <STRUCT Name="Face">
-          <ATOM Name="Item" Value="ma_VISAGE.item"/>
-          <ATOM Name="Texture" Value="Lacustre/Low Quality/Young"/>
-        </STRUCT>
-      </STRUCT>
       <STRUCT Name="MovementSpeeds">
         <ATOM Name="WalkSpeed" Value="1.66"/>
       </STRUCT>