aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/MessagingServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/MessagingServer')
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs26
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs16
-rw-r--r--OpenSim/Grid/MessagingServer/UserManager.cs8
3 files changed, 25 insertions, 25 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
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 3e35f20..e02aa06 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -36,13 +36,13 @@ namespace OpenSim.Grid.MessagingServer
36{ 36{
37 public delegate RegionProfileData GetRegionData(ulong region_handle); 37 public delegate RegionProfileData GetRegionData(ulong region_handle);
38 public delegate void Done(PresenceInformer obj); 38 public delegate void Done(PresenceInformer obj);
39 39
40 40
41 public class PresenceInformer 41 public class PresenceInformer
42 { 42 {
43 public event GetRegionData OnGetRegionData; 43 public event GetRegionData OnGetRegionData;
44 public event Done OnDone; 44 public event Done OnDone;
45 45
46 private GetRegionData handlerGetRegionData = null; 46 private GetRegionData handlerGetRegionData = null;
47 private Done handlerDone = null; 47 private Done handlerDone = null;
48 48
@@ -102,10 +102,10 @@ namespace OpenSim.Grid.MessagingServer
102 PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString()); 102 PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString());
103 if (TalkingAbout.OnlineYN) 103 if (TalkingAbout.OnlineYN)
104 PresenceParams.Add("status","TRUE"); 104 PresenceParams.Add("status","TRUE");
105 else 105 else
106 PresenceParams.Add("status","FALSE"); 106 PresenceParams.Add("status","FALSE");
107 107
108 108
109 109
110 110
111 ArrayList SendParams = new ArrayList(); 111 ArrayList SendParams = new ArrayList();
@@ -123,12 +123,12 @@ namespace OpenSim.Grid.MessagingServer
123 catch (WebException) 123 catch (WebException)
124 { 124 {
125 m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname); 125 m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname);
126 } 126 }
127 } 127 }
128 else 128 else
129 { 129 {
130 m_log.Info("[PRESENCEUPDATER]: Region data was null skipping"); 130 m_log.Info("[PRESENCEUPDATER]: Region data was null skipping");
131 131
132 } 132 }
133 133
134 handlerDone = OnDone; 134 handlerDone = OnDone;
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs
index 605c3fb..de41756 100644
--- a/OpenSim/Grid/MessagingServer/UserManager.cs
+++ b/OpenSim/Grid/MessagingServer/UserManager.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Grid.MessagingServer
44 public UserAgentData GetUserAgentData(LLUUID AgentID) 44 public UserAgentData GetUserAgentData(LLUUID AgentID)
45 { 45 {
46 UserProfileData userProfile = GetUserProfile(AgentID); 46 UserProfileData userProfile = GetUserProfile(AgentID);
47 47
48 if (userProfile != null) 48 if (userProfile != null)
49 { 49 {
50 return userProfile.CurrentAgent; 50 return userProfile.CurrentAgent;
@@ -58,19 +58,19 @@ namespace OpenSim.Grid.MessagingServer
58 public override UserProfileData SetupMasterUser(string firstName, string lastName) 58 public override UserProfileData SetupMasterUser(string firstName, string lastName)
59 { 59 {
60 //throw new Exception("The method or operation is not implemented."); 60 //throw new Exception("The method or operation is not implemented.");
61 return null; 61 return null;
62 } 62 }
63 63
64 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) 64 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
65 { 65 {
66 //throw new Exception("The method or operation is not implemented."); 66 //throw new Exception("The method or operation is not implemented.");
67 return null; 67 return null;
68 } 68 }
69 69
70 public override UserProfileData SetupMasterUser(LLUUID uuid) 70 public override UserProfileData SetupMasterUser(LLUUID uuid)
71 { 71 {
72 //throw new Exception("The method or operation is not implemented."); 72 //throw new Exception("The method or operation is not implemented.");
73 return null; 73 return null;
74 } 74 }
75 } 75 }
76} 76}