diff options
| author | Melanie | 2011-02-27 19:47:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-27 19:47:37 +0000 |
| commit | 9b277b372be4e1071c02f87a53cb70a4324d77fa (patch) | |
| tree | 35183674cbacc79f2931a9cc11f747974fff845b /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Fix a few little things (diff) | |
| parent | change some log messages from info to debug (diff) | |
| download | opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.zip opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.gz opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.bz2 opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2e116a2..fe111ff 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3342,7 +3342,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3342 | // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport | 3342 | // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport |
| 3343 | 3343 | ||
| 3344 | // Don't disable this log message - it's too helpful | 3344 | // Don't disable this log message - it's too helpful |
| 3345 | m_log.InfoFormat( | 3345 | m_log.DebugFormat( |
| 3346 | "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, teleportflags {6})", | 3346 | "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, teleportflags {6})", |
| 3347 | RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname, | 3347 | RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname, |
| 3348 | agent.AgentID, agent.circuitcode, teleportFlags); | 3348 | agent.AgentID, agent.circuitcode, teleportFlags); |