diff options
author | Jeff Ames | 2008-05-30 08:35:57 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-30 08:35:57 +0000 |
commit | 04625109560fb54d613b1fc9c81a8a9f387720c9 (patch) | |
tree | af00035a676beee3542a55cd13ce09e57f1ad778 /OpenSim/Framework/Communications | |
parent | thanks krtaylor for a (diff) | |
download | opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.zip opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.gz opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.bz2 opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index cc64e6c..e8353b4 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -255,28 +255,28 @@ namespace OpenSim.Framework.Communications | |||
255 | remote_client.SendNameReply(uuid, names[0], names[1]); | 255 | remote_client.SendNameReply(uuid, names[0], names[1]); |
256 | } | 256 | } |
257 | 257 | ||
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||
261 | private string[] doUUIDNameRequest(LLUUID uuid) | 261 | private string[] doUUIDNameRequest(LLUUID uuid) |
262 | { | 262 | { |
263 | string[] returnstring = new string[0]; | 263 | string[] returnstring = new string[0]; |
264 | bool doLookup = false; | 264 | bool doLookup = false; |
265 | 265 | ||
266 | 266 | ||
267 | lock (m_nameRequestCache) | 267 | lock (m_nameRequestCache) |
268 | { | 268 | { |
269 | if (m_nameRequestCache.ContainsKey(uuid)) | 269 | if (m_nameRequestCache.ContainsKey(uuid)) |
270 | { | 270 | { |
271 | returnstring = m_nameRequestCache[uuid]; | 271 | returnstring = m_nameRequestCache[uuid]; |
272 | } | 272 | } |
273 | else | 273 | else |
274 | { | 274 | { |
275 | // we don't want to lock the dictionary while we're doing the lookup | 275 | // we don't want to lock the dictionary while we're doing the lookup |
276 | doLookup = true; | 276 | doLookup = true; |
277 | } | 277 | } |
278 | } | 278 | } |
279 | 279 | ||
280 | if (doLookup) { | 280 | if (doLookup) { |
281 | UserProfileData profileData = m_userService.GetUserProfile(uuid); | 281 | UserProfileData profileData = m_userService.GetUserProfile(uuid); |
282 | if (profileData != null) | 282 | if (profileData != null) |
@@ -293,7 +293,7 @@ namespace OpenSim.Framework.Communications | |||
293 | } | 293 | } |
294 | } | 294 | } |
295 | return returnstring; | 295 | return returnstring; |
296 | 296 | ||
297 | } | 297 | } |
298 | 298 | ||
299 | public bool UUIDNameCachedTest(LLUUID uuid) | 299 | public bool UUIDNameCachedTest(LLUUID uuid) |
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications | |||
311 | string lastname = names[1]; | 311 | string lastname = names[1]; |
312 | 312 | ||
313 | return firstname + " " + lastname; | 313 | return firstname + " " + lastname; |
314 | 314 | ||
315 | } | 315 | } |
316 | return "(hippos)"; | 316 | return "(hippos)"; |
317 | } | 317 | } |