aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/MessagingServer/MessageService.cs
diff options
context:
space:
mode:
authorJeff Ames2008-06-04 09:59:27 +0000
committerJeff Ames2008-06-04 09:59:27 +0000
commit4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch)
treecfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Grid/MessagingServer/MessageService.cs
parent* If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff)
downloadopensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip
opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz
opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2
opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Grid/MessagingServer/MessageService.cs')
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 0abb89d..cec596f 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -67,12 +67,12 @@ namespace OpenSim.Grid.MessagingServer
67 UserConfig uc = new UserConfig(); 67 UserConfig uc = new UserConfig();
68 uc.DatabaseConnect = cfg.DatabaseConnect; 68 uc.DatabaseConnect = cfg.DatabaseConnect;
69 uc.DatabaseProvider = cfg.DatabaseProvider; 69 uc.DatabaseProvider = cfg.DatabaseProvider;
70 70
71 m_userManager._config = uc; 71 m_userManager._config = uc;
72 m_userManager.AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect); 72 m_userManager.AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect);
73 } 73 }
74 74
75 75
76 76
77 #region FriendList Methods 77 #region FriendList Methods
78 78
@@ -152,7 +152,7 @@ namespace OpenSim.Grid.MessagingServer
152 friendlistupdater.OnDone += PresenceUpdateDone; 152 friendlistupdater.OnDone += PresenceUpdateDone;
153 WaitCallback cb = new WaitCallback(friendlistupdater.go); 153 WaitCallback cb = new WaitCallback(friendlistupdater.go);
154 ThreadPool.QueueUserWorkItem(cb); 154 ThreadPool.QueueUserWorkItem(cb);
155 155
156 } 156 }
157 else 157 else
158 { 158 {
@@ -173,7 +173,7 @@ namespace OpenSim.Grid.MessagingServer
173 { 173 {
174 // we need to send out online status update, but the user is already subscribed 174 // we need to send out online status update, but the user is already subscribed
175 } 175 }
176 176
177 UserAgentData p2Handle = m_userManager.GetUserAgentData(friendpresence.agentData.AgentID); 177 UserAgentData p2Handle = m_userManager.GetUserAgentData(friendpresence.agentData.AgentID);
178 178
179 if (p2Handle != null) 179 if (p2Handle != null)
@@ -196,7 +196,7 @@ namespace OpenSim.Grid.MessagingServer
196 // skip, agent doesn't appear to exist anymore 196 // skip, agent doesn't appear to exist anymore
197 } 197 }
198 198
199 199
200 200
201 //SendRegionPresenceUpdate(userpresence, friendpresence); 201 //SendRegionPresenceUpdate(userpresence, friendpresence);
202 } 202 }
@@ -315,8 +315,8 @@ namespace OpenSim.Grid.MessagingServer
315 UserAgentData p2Handle = m_userManager.GetUserAgentData(friendd.agentData.AgentID); 315 UserAgentData p2Handle = m_userManager.GetUserAgentData(friendd.agentData.AgentID);
316 if (p2Handle != null) 316 if (p2Handle != null)
317 { 317 {
318 318
319 319
320 friendd.regionData.regionHandle = p2Handle.Handle; 320 friendd.regionData.regionHandle = p2Handle.Handle;
321 PresenceInformer friendlistupdater = new PresenceInformer(); 321 PresenceInformer friendlistupdater = new PresenceInformer();
322 friendlistupdater.presence1 = AgentData; 322 friendlistupdater.presence1 = AgentData;
@@ -328,11 +328,11 @@ namespace OpenSim.Grid.MessagingServer
328 328
329 friendlistupdater.OnGetRegionData += GetRegionInfo; 329 friendlistupdater.OnGetRegionData += GetRegionInfo;
330 friendlistupdater.OnDone += PresenceUpdateDone; 330 friendlistupdater.OnDone += PresenceUpdateDone;
331 331
332 WaitCallback cb3 = new WaitCallback(friendlistupdater.go); 332 WaitCallback cb3 = new WaitCallback(friendlistupdater.go);
333 ThreadPool.QueueUserWorkItem(cb3); 333 ThreadPool.QueueUserWorkItem(cb3);
334 334
335 335
336 336
337 } 337 }
338 else 338 else
@@ -519,14 +519,14 @@ namespace OpenSim.Grid.MessagingServer
519 else 519 else
520 { 520 {
521 // Don't lock the cache while we're looking up the region! 521 // Don't lock the cache while we're looking up the region!
522 lookup = true; 522 lookup = true;
523 } 523 }
524 } 524 }
525 525
526 if (lookup) 526 if (lookup)
527 { 527 {
528 regionInfo = RequestRegionInfo(regionhandle); 528 regionInfo = RequestRegionInfo(regionhandle);
529 529
530 if (regionInfo != null) 530 if (regionInfo != null)
531 { 531 {
532 lock (m_regionInfoCache) 532 lock (m_regionInfoCache)
@@ -542,7 +542,7 @@ namespace OpenSim.Grid.MessagingServer
542 } 542 }
543 } 543 }
544 } 544 }
545 545
546 return regionInfo; 546 return regionInfo;
547 } 547 }
548 548
@@ -555,7 +555,7 @@ namespace OpenSim.Grid.MessagingServer
555 cachecount = m_regionInfoCache.Count; 555 cachecount = m_regionInfoCache.Count;
556 m_regionInfoCache.Clear(); 556 m_regionInfoCache.Clear();
557 } 557 }
558 558
559 return cachecount; 559 return cachecount;
560 } 560 }
561 561