OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: fussy little change to put colons in some log output

0.6.0-stable
Justin Clarke Casey 2008-11-03 20:10:54 +00:00
parent 580b11779a
commit 1e56bda487
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
View File

@ -75,19 +75,19 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
{ {
if ((_config = config.Configs["Concierge"]) == null) if ((_config = config.Configs["Concierge"]) == null)
{ {
_log.InfoFormat("[Concierge] no configuration section [Concierge] in OpenSim.ini: module not configured"); _log.InfoFormat("[Concierge]: no configuration section [Concierge] in OpenSim.ini: module not configured");
return; return;
} }
if (!_config.GetBoolean("enabled", false)) if (!_config.GetBoolean("enabled", false))
{ {
_log.InfoFormat("[Concierge] module disabled by OpenSim.ini configuration"); _log.InfoFormat("[Concierge]: module disabled by OpenSim.ini configuration");
return; return;
} }
} }
catch (Exception) catch (Exception)
{ {
_log.Info("[Concierge] module not configured"); _log.Info("[Concierge]: module not configured");
return; return;
} }
@ -270,7 +270,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
if (_conciergedScenes.Contains(client.Scene)) if (_conciergedScenes.Contains(client.Scene))
{ {
_log.DebugFormat("[Concierge] {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName); _log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName);
ScenePresence agent = (client.Scene as Scene).GetScenePresence(client.AgentId); ScenePresence agent = (client.Scene as Scene).GetScenePresence(client.AgentId);
RemoveFromAttendeeList(agent, agent.Scene); RemoveFromAttendeeList(agent, agent.Scene);
AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName, AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName,
@ -283,7 +283,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
{ {
if (_conciergedScenes.Contains(agent.Scene)) if (_conciergedScenes.Contains(agent.Scene))
{ {
_log.DebugFormat("[Concierge] {0} enters {1}", agent.Name, agent.Scene.RegionInfo.RegionName); _log.DebugFormat("[Concierge]: {0} enters {1}", agent.Name, agent.Scene.RegionInfo.RegionName);
AddToAttendeeList(agent, agent.Scene); AddToAttendeeList(agent, agent.Scene);
WelcomeAvatar(agent, agent.Scene); WelcomeAvatar(agent, agent.Scene);
AnnounceToAgentsRegion(agent, String.Format(_announceEntering, agent.Name, agent.Scene.RegionInfo.RegionName, AnnounceToAgentsRegion(agent, String.Format(_announceEntering, agent.Name, agent.Scene.RegionInfo.RegionName,
@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
{ {
if (_conciergedScenes.Contains(agent.Scene)) if (_conciergedScenes.Contains(agent.Scene))
{ {
_log.DebugFormat("[Concierge] {0} leaves {1}", agent.Name, agent.Scene.RegionInfo.RegionName); _log.DebugFormat("[Concierge]: {0} leaves {1}", agent.Name, agent.Scene.RegionInfo.RegionName);
RemoveFromAttendeeList(agent, agent.Scene); RemoveFromAttendeeList(agent, agent.Scene);
AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName, AnnounceToAgentsRegion(agent, String.Format(_announceLeaving, agent.Name, agent.Scene.RegionInfo.RegionName,
_sceneAttendees[agent.Scene].Count)); _sceneAttendees[agent.Scene].Count));
@ -321,13 +321,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
{ {
if (!_sceneAttendees.ContainsKey(scene)) if (!_sceneAttendees.ContainsKey(scene))
{ {
_log.WarnFormat("[Concierge] attendee list missing for region {0}", scene.RegionInfo.RegionName); _log.WarnFormat("[Concierge]: attendee list missing for region {0}", scene.RegionInfo.RegionName);
return; return;
} }
List<ScenePresence> attendees = _sceneAttendees[scene]; List<ScenePresence> attendees = _sceneAttendees[scene];
if (!attendees.Contains(agent)) if (!attendees.Contains(agent))
{ {
_log.WarnFormat("[Concierge] avatar {0} sneaked in (not on attendee list of region {1})", _log.WarnFormat("[Concierge]: avatar {0} sneaked in (not on attendee list of region {1})",
agent.Name, scene.RegionInfo.RegionName); agent.Name, scene.RegionInfo.RegionName);
return; return;
} }
@ -359,17 +359,17 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
} }
catch (IOException ioe) catch (IOException ioe)
{ {
_log.ErrorFormat("[Concierge] run into trouble reading welcome file {0} for region {1} for avatar {2}: {3}", _log.ErrorFormat("[Concierge]: run into trouble reading welcome file {0} for region {1} for avatar {2}: {3}",
welcome, scene.RegionInfo.RegionName, agent.Name, ioe); welcome, scene.RegionInfo.RegionName, agent.Name, ioe);
} }
catch (FormatException fe) catch (FormatException fe)
{ {
_log.ErrorFormat("[Concierge] welcome file {0} is malformed: {1}", welcome, fe); _log.ErrorFormat("[Concierge]: welcome file {0} is malformed: {1}", welcome, fe);
} }
} }
return; return;
} }
_log.DebugFormat("[Concierge] no welcome message for region {0}", scene.RegionInfo.RegionName); _log.DebugFormat("[Concierge]: no welcome message for region {0}", scene.RegionInfo.RegionName);
} }
} }
@ -381,7 +381,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
if ((client.Scene is Scene) && (client.Scene as Scene).TryGetAvatar(client.AgentId, out agent)) if ((client.Scene is Scene) && (client.Scene as Scene).TryGetAvatar(client.AgentId, out agent))
AnnounceToAgentsRegion(agent, msg); AnnounceToAgentsRegion(agent, msg);
else else
_log.DebugFormat("[Concierge] could not find an agent for client {0}", client.Name); _log.DebugFormat("[Concierge]: could not find an agent for client {0}", client.Name);
} }
protected void AnnounceToAgentsRegion(ScenePresence scenePresence, string msg) protected void AnnounceToAgentsRegion(ScenePresence scenePresence, string msg)