diff options
-rw-r--r-- | OpenSim/Framework/AvatarWearable.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 3 |
2 files changed, 7 insertions, 2 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 | ||
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index d2794f9..64bcfa2 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -56,9 +56,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
56 | // other transparency defined in assets | 56 | // other transparency defined in assets |
57 | new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"), | 57 | new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"), |
58 | new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"), | 58 | new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"), |
59 | |||
60 | new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7") // other eyes | ||
61 | }; | 59 | }; |
60 | |||
62 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 61 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
63 | 62 | ||
64 | /// <summary> | 63 | /// <summary> |