aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-01-26 21:33:20 +0000
committerDr Scofield2009-01-26 21:33:20 +0000
commit8c4ac64d80f8298549b3fcc46d141d7bd9699af1 (patch)
treecbf1308bb54a9fc96d34ce6f1824f08f14a39294
parent+ completed python test server (diff)
downloadopensim-SC_OLD-8c4ac64d80f8298549b3fcc46d141d7bd9699af1.zip
opensim-SC_OLD-8c4ac64d80f8298549b3fcc46d141d7bd9699af1.tar.gz
opensim-SC_OLD-8c4ac64d80f8298549b3fcc46d141d7bd9699af1.tar.bz2
opensim-SC_OLD-8c4ac64d80f8298549b3fcc46d141d7bd9699af1.tar.xz
~ fix: Concierge reports avatar leaving region twice
~ cleaning up log statements
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index dbf4a70..35d1905 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -264,7 +264,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
264 public override void OnNewClient(IClientAPI client) 264 public override void OnNewClient(IClientAPI client)
265 { 265 {
266 client.OnLogout += OnClientLoggedOut; 266 client.OnLogout += OnClientLoggedOut;
267 client.OnConnectionClosed += OnClientLoggedOut;
268 267
269 if (_replacingChatModule) 268 if (_replacingChatModule)
270 client.OnChatFromClient += OnChatFromClient; 269 client.OnChatFromClient += OnChatFromClient;
@@ -343,7 +342,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
343 List<UUID> attendees = _sceneAttendees[scene]; 342 List<UUID> attendees = _sceneAttendees[scene];
344 if (!attendees.Contains(agentID)) 343 if (!attendees.Contains(agentID))
345 { 344 {
346 _log.WarnFormat("[Concierge]: avatar {0} sneaked in (not on attendee list of region {1})", 345 _log.WarnFormat("[Concierge]: avatar {0} must have sneaked in to region {1} earlier",
347 name, scene.RegionInfo.RegionName); 346 name, scene.RegionInfo.RegionName);
348 return; 347 return;
349 } 348 }
@@ -393,7 +392,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
393 list.Append("</avatar>"); 392 list.Append("</avatar>");
394 } 393 }
395 string payload = list.ToString(); 394 string payload = list.ToString();
396 _log.DebugFormat("[Concierge]: posting to {0}:\n{1}", _brokerURI, payload);
397 395
398 // post via REST to broker 396 // post via REST to broker
399 HttpWebRequest updatePost = WebRequest.Create(_brokerURI) as HttpWebRequest; 397 HttpWebRequest updatePost = WebRequest.Create(_brokerURI) as HttpWebRequest;