aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-03 20:10:54 +0000
committerJustin Clarke Casey2008-11-03 20:10:54 +0000
commit1e56bda4872d6fffd465d91576320c73e4a27d47 (patch)
treea2ed20ce660f8893cc67062f7abe68881345b022 /OpenSim
parentOn TP, child-agents weren't closed down properly, as the list of child-regions (diff)
downloadopensim-SC-1e56bda4872d6fffd465d91576320c73e4a27d47.zip
opensim-SC-1e56bda4872d6fffd465d91576320c73e4a27d47.tar.gz
opensim-SC-1e56bda4872d6fffd465d91576320c73e4a27d47.tar.bz2
opensim-SC-1e56bda4872d6fffd465d91576320c73e4a27d47.tar.xz
* minor: fussy little change to put colons in some log output
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index 56bb357..36e90ba 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -75,19 +75,19 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
75 { 75 {
76 if ((_config = config.Configs["Concierge"]) == null) 76 if ((_config = config.Configs["Concierge"]) == null)
77 { 77 {
78 _log.InfoFormat("[Concierge] no configuration section [Concierge] in OpenSim.ini: module not configured"); 78 _log.InfoFormat("[Concierge]: no configuration section [Concierge] in OpenSim.ini: module not configured");
79 return; 79 return;
80 } 80 }
81 81
82 if (!_config.GetBoolean("enabled", false)) 82 if (!_config.GetBoolean("enabled", false))
83 { 83 {
84 _log.InfoFormat("[Concierge] module disabled by OpenSim.ini configuration"); 84 _log.InfoFormat("[Concierge]: module disabled by OpenSim.ini configuration");
85 return; 85 return;
86 } 86 }
87 } 87 }
88 catch (Exception) 88 catch (Exception)
89 { 89 {
90 _log.Info("[Concierge] module not configured"); 90 _log.Info("[Concierge]: module not configured");
91 return; 91 return;
92 } 92 }
93 93
@@ -270,7 +270,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
270 270
271 if (_conciergedScenes.Contains(client.Scene)) 271 if (_conciergedScenes.Contains(client.Scene))
272 { 272 {
273 _log.DebugFormat("[Concierge] {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName); 273 _log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName);
274 ScenePresence agent = (client.Scene as Scene).GetScenePresence(client.AgentId); 274 ScenePresence agent = (client.Scene as Scene).GetScenePresence(client.AgentId);
275 RemoveFromAttendeeList(agent, agent.Scene); 275 RemoveFromAttendeeList(agent, agent.Scene);
276 AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName, 276 AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName,
@@ -283,7 +283,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
283 { 283 {
284 if (_conciergedScenes.Contains(agent.Scene)) 284 if (_conciergedScenes.Contains(agent.Scene))
285 { 285 {
286 _log.DebugFormat("[Concierge] {0} enters {1}", agent.Name, agent.Scene.RegionInfo.RegionName); 286 _log.DebugFormat("[Concierge]: {0} enters {1}", agent.Name, agent.Scene.RegionInfo.RegionName);
287 AddToAttendeeList(agent, agent.Scene); 287 AddToAttendeeList(agent, agent.Scene);
288 WelcomeAvatar(agent, agent.Scene); 288 WelcomeAvatar(agent, agent.Scene);
289 AnnounceToAgentsRegion(agent, String.Format(_announceEntering, agent.Name, agent.Scene.RegionInfo.RegionName, 289 AnnounceToAgentsRegion(agent, String.Format(_announceEntering, agent.Name, agent.Scene.RegionInfo.RegionName,
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
296 { 296 {
297 if (_conciergedScenes.Contains(agent.Scene)) 297 if (_conciergedScenes.Contains(agent.Scene))
298 { 298 {
299 _log.DebugFormat("[Concierge] {0} leaves {1}", agent.Name, agent.Scene.RegionInfo.RegionName); 299 _log.DebugFormat("[Concierge]: {0} leaves {1}", agent.Name, agent.Scene.RegionInfo.RegionName);
300 RemoveFromAttendeeList(agent, agent.Scene); 300 RemoveFromAttendeeList(agent, agent.Scene);
301 AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName, 301 AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName,
302 _sceneAttendees[agent.Scene].Count)); 302 _sceneAttendees[agent.Scene].Count));
@@ -321,13 +321,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
321 { 321 {
322 if (!_sceneAttendees.ContainsKey(scene)) 322 if (!_sceneAttendees.ContainsKey(scene))
323 { 323 {
324 _log.WarnFormat("[Concierge] attendee list missing for region {0}", scene.RegionInfo.RegionName); 324 _log.WarnFormat("[Concierge]: attendee list missing for region {0}", scene.RegionInfo.RegionName);
325 return; 325 return;
326 } 326 }
327 List<ScenePresence> attendees = _sceneAttendees[scene]; 327 List<ScenePresence> attendees = _sceneAttendees[scene];
328 if (!attendees.Contains(agent)) 328 if (!attendees.Contains(agent))
329 { 329 {
330 _log.WarnFormat("[Concierge] avatar {0} sneaked in (not on attendee list of region {1})", 330 _log.WarnFormat("[Concierge]: avatar {0} sneaked in (not on attendee list of region {1})",
331 agent.Name, scene.RegionInfo.RegionName); 331 agent.Name, scene.RegionInfo.RegionName);
332 return; 332 return;
333 } 333 }
@@ -359,17 +359,17 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
359 } 359 }
360 catch (IOException ioe) 360 catch (IOException ioe)
361 { 361 {
362 _log.ErrorFormat("[Concierge] run into trouble reading welcome file {0} for region {1} for avatar {2}: {3}", 362 _log.ErrorFormat("[Concierge]: run into trouble reading welcome file {0} for region {1} for avatar {2}: {3}",
363 welcome, scene.RegionInfo.RegionName, agent.Name, ioe); 363 welcome, scene.RegionInfo.RegionName, agent.Name, ioe);
364 } 364 }
365 catch (FormatException fe) 365 catch (FormatException fe)
366 { 366 {
367 _log.ErrorFormat("[Concierge] welcome file {0} is malformed: {1}", welcome, fe); 367 _log.ErrorFormat("[Concierge]: welcome file {0} is malformed: {1}", welcome, fe);
368 } 368 }
369 } 369 }
370 return; 370 return;
371 } 371 }
372 _log.DebugFormat("[Concierge] no welcome message for region {0}", scene.RegionInfo.RegionName); 372 _log.DebugFormat("[Concierge]: no welcome message for region {0}", scene.RegionInfo.RegionName);
373 } 373 }
374 } 374 }
375 375
@@ -381,7 +381,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
381 if ((client.Scene is Scene) && (client.Scene as Scene).TryGetAvatar(client.AgentId, out agent)) 381 if ((client.Scene is Scene) && (client.Scene as Scene).TryGetAvatar(client.AgentId, out agent))
382 AnnounceToAgentsRegion(agent, msg); 382 AnnounceToAgentsRegion(agent, msg);
383 else 383 else
384 _log.DebugFormat("[Concierge] could not find an agent for client {0}", client.Name); 384 _log.DebugFormat("[Concierge]: could not find an agent for client {0}", client.Name);
385 } 385 }
386 386
387 protected void AnnounceToAgentsRegion(ScenePresence scenePresence, string msg) 387 protected void AnnounceToAgentsRegion(ScenePresence scenePresence, string msg)