From a7079c9227b6fc53bf554a9aa2c73d199d6d9e67 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 4 Dec 2015 18:29:31 +0000
Subject: add default eyes to default wearables, and revert previus bad commit
---
OpenSim/Framework/AvatarWearable.cs | 6 ++++++
.../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
public static readonly UUID DEFAULT_SKIN_ITEM = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
public static readonly UUID DEFAULT_SKIN_ASSET = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
+ public static readonly UUID DEFAULT_EYES_ITEM = new UUID("cdc31054-eed8-4021-994f-4e0c6e861b50");
+ public static readonly UUID DEFAULT_EYES_ASSET = new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7");
+
public static readonly UUID DEFAULT_SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
public static readonly UUID DEFAULT_SHIRT_ASSET = new UUID("00000000-38f9-1111-024e-222222111110");
@@ -241,6 +244,9 @@ namespace OpenSim.Framework
// Skin
defaultWearables[SKIN].Add(DEFAULT_SKIN_ITEM, DEFAULT_SKIN_ASSET);
+ // Eyes
+ defaultWearables[EYES].Add(DEFAULT_EYES_ITEM, DEFAULT_EYES_ASSET);
+
// Shirt
defaultWearables[SHIRT].Add(DEFAULT_SHIRT_ITEM, DEFAULT_SHIRT_ASSET);
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
// other transparency defined in assets
new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"),
new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"),
-
- new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7") // other eyes
};
+
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
--
cgit v1.1