aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2015-12-04 18:29:31 +0000
committerUbitUmarov2015-12-04 18:29:31 +0000
commita7079c9227b6fc53bf554a9aa2c73d199d6d9e67 (patch)
treebc74fb9034cc002dbd96cd69cfd4471d9b662526 /OpenSim/Framework
parentadd other Eyes asset id to xferupload defaults (diff)
downloadopensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.zip
opensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.tar.gz
opensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.tar.bz2
opensim-SC_OLD-a7079c9227b6fc53bf554a9aa2c73d199d6d9e67.tar.xz
add default eyes to default wearables, and revert previus bad commit
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarWearable.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 80ed77f..7bc46ed 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -82,6 +82,9 @@ namespace OpenSim.Framework
82 public static readonly UUID DEFAULT_SKIN_ITEM = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9"); 82 public static readonly UUID DEFAULT_SKIN_ITEM = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
83 public static readonly UUID DEFAULT_SKIN_ASSET = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb"); 83 public static readonly UUID DEFAULT_SKIN_ASSET = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
84 84
85 public static readonly UUID DEFAULT_EYES_ITEM = new UUID("cdc31054-eed8-4021-994f-4e0c6e861b50");
86 public static readonly UUID DEFAULT_EYES_ASSET = new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7");
87
85 public static readonly UUID DEFAULT_SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000"); 88 public static readonly UUID DEFAULT_SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
86 public static readonly UUID DEFAULT_SHIRT_ASSET = new UUID("00000000-38f9-1111-024e-222222111110"); 89 public static readonly UUID DEFAULT_SHIRT_ASSET = new UUID("00000000-38f9-1111-024e-222222111110");
87 90
@@ -241,6 +244,9 @@ namespace OpenSim.Framework
241 // Skin 244 // Skin
242 defaultWearables[SKIN].Add(DEFAULT_SKIN_ITEM, DEFAULT_SKIN_ASSET); 245 defaultWearables[SKIN].Add(DEFAULT_SKIN_ITEM, DEFAULT_SKIN_ASSET);
243 246
247 // Eyes
248 defaultWearables[EYES].Add(DEFAULT_EYES_ITEM, DEFAULT_EYES_ASSET);
249
244 // Shirt 250 // Shirt
245 defaultWearables[SHIRT].Add(DEFAULT_SHIRT_ITEM, DEFAULT_SHIRT_ASSET); 251 defaultWearables[SHIRT].Add(DEFAULT_SHIRT_ITEM, DEFAULT_SHIRT_ASSET);
246 252