aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRob Smart2009-10-09 16:13:55 +0100
committerMelanie2009-10-09 17:22:02 +0100
commit1c220e173c37d835542983898dc01b004112b4a9 (patch)
tree975b83440995144ff57efcb23d2874da59a5af49
parentPutting the lock back in TryGetValue. (diff)
downloadopensim-SC-1c220e173c37d835542983898dc01b004112b4a9.zip
opensim-SC-1c220e173c37d835542983898dc01b004112b4a9.tar.gz
opensim-SC-1c220e173c37d835542983898dc01b004112b4a9.tar.bz2
opensim-SC-1c220e173c37d835542983898dc01b004112b4a9.tar.xz
Adding a hair item to the default wearables, fixes newly created avatars appearing as a cloud
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs4
-rw-r--r--OpenSim/Framework/AvatarWearable.cs4
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 3f4214e..56fcc15 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Framework
66 private static UUID SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000"); 66 private static UUID SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
67 private static UUID PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120"); 67 private static UUID PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120");
68 private static UUID PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111"); 68 private static UUID PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
69 private static UUID HAIR_ASSET = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
70 private static UUID HAIR_ITEM = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66");
69 71
70 public readonly static int VISUALPARAM_COUNT = 218; 72 public readonly static int VISUALPARAM_COUNT = 218;
71 73
@@ -238,6 +240,8 @@ namespace OpenSim.Framework
238 m_wearables[BODY].ItemID = BODY_ITEM; 240 m_wearables[BODY].ItemID = BODY_ITEM;
239 m_wearables[SKIN].AssetID = SKIN_ASSET; 241 m_wearables[SKIN].AssetID = SKIN_ASSET;
240 m_wearables[SKIN].ItemID = SKIN_ITEM; 242 m_wearables[SKIN].ItemID = SKIN_ITEM;
243 m_wearables[HAIR].AssetID = HAIR_ASSET;
244 m_wearables[HAIR].ItemID = HAIR_ITEM;
241 m_wearables[SHIRT].AssetID = SHIRT_ASSET; 245 m_wearables[SHIRT].AssetID = SHIRT_ASSET;
242 m_wearables[SHIRT].ItemID = SHIRT_ITEM; 246 m_wearables[SHIRT].ItemID = SHIRT_ITEM;
243 m_wearables[PANTS].AssetID = PANTS_ASSET; 247 m_wearables[PANTS].AssetID = PANTS_ASSET;
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 4a5253c..87d9e61 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -60,6 +60,10 @@ namespace OpenSim.Framework
60 // Body 60 // Body
61 defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9"); 61 defaultWearables[0].ItemID = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
62 defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73"); 62 defaultWearables[0].AssetID = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
63
64 // Hair
65 defaultWearables[2].ItemID = new UUID("d342e6c1-b9d2-11dc-95ff-0800200c9a66");
66 defaultWearables[2].AssetID = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
63 67
64 // Skin 68 // Skin
65 defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9"); 69 defaultWearables[1].ItemID = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");