diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/AvatarWearable.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 35 |
3 files changed, 20 insertions, 23 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"); |
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 2410f31..4bf9018 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -209,35 +209,24 @@ namespace OpenSim.Framework.Communications | |||
209 | 209 | ||
210 | private string[] doUUIDNameRequest(UUID uuid) | 210 | private string[] doUUIDNameRequest(UUID uuid) |
211 | { | 211 | { |
212 | string[] returnstring = new string[0]; | ||
213 | bool doLookup = false; | ||
214 | |||
215 | lock (m_nameRequestCache) | 212 | lock (m_nameRequestCache) |
216 | { | 213 | { |
217 | if (m_nameRequestCache.ContainsKey(uuid)) | 214 | if (m_nameRequestCache.ContainsKey(uuid)) |
218 | { | 215 | return m_nameRequestCache[uuid]; |
219 | returnstring = m_nameRequestCache[uuid]; | ||
220 | } | ||
221 | else | ||
222 | { | ||
223 | // we don't want to lock the dictionary while we're doing the lookup | ||
224 | doLookup = true; | ||
225 | } | ||
226 | } | 216 | } |
227 | 217 | ||
228 | if (doLookup) { | 218 | string[] returnstring = new string[0]; |
229 | UserProfileData profileData = m_userService.GetUserProfile(uuid); | 219 | CachedUserInfo uinfo = UserProfileCacheService.GetUserDetails(uuid); |
230 | if (profileData != null) | 220 | |
221 | if ((uinfo != null) && (uinfo.UserProfile != null)) | ||
222 | { | ||
223 | returnstring = new string[2]; | ||
224 | returnstring[0] = uinfo.UserProfile.FirstName; | ||
225 | returnstring[1] = uinfo.UserProfile.SurName; | ||
226 | lock (m_nameRequestCache) | ||
231 | { | 227 | { |
232 | returnstring = new string[2]; | 228 | if (!m_nameRequestCache.ContainsKey(uuid)) |
233 | // UUID profileId = profileData.ID; | 229 | m_nameRequestCache.Add(uuid, returnstring); |
234 | returnstring[0] = profileData.FirstName; | ||
235 | returnstring[1] = profileData.SurName; | ||
236 | lock (m_nameRequestCache) | ||
237 | { | ||
238 | if (!m_nameRequestCache.ContainsKey(uuid)) | ||
239 | m_nameRequestCache.Add(uuid, returnstring); | ||
240 | } | ||
241 | } | 230 | } |
242 | } | 231 | } |
243 | 232 | ||