diff options
author | Melanie | 2012-02-15 01:11:17 +0000 |
---|---|---|
committer | Melanie | 2012-02-15 01:11:17 +0000 |
commit | 272ba5a741ad1b486ee11174a46fa15573a78e83 (patch) | |
tree | 41a330f517cff6bda34e38657ad0d359a35eab86 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Refactor appearance saving for NPC to use AvatarFactoryModule interface. (diff) | |
download | opensim-SC-272ba5a741ad1b486ee11174a46fa15573a78e83.zip opensim-SC-272ba5a741ad1b486ee11174a46fa15573a78e83.tar.gz opensim-SC-272ba5a741ad1b486ee11174a46fa15573a78e83.tar.bz2 opensim-SC-272ba5a741ad1b486ee11174a46fa15573a78e83.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ec5cf32..bbdf35d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3408,9 +3408,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3408 | 3408 | ||
3409 | // Don't disable this log message - it's too helpful | 3409 | // Don't disable this log message - it's too helpful |
3410 | m_log.DebugFormat( | 3410 | m_log.DebugFormat( |
3411 | "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, teleportflags {6}, position {7})", | 3411 | "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags {8}, position {9})", |
3412 | RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname, | 3412 | RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname, |
3413 | agent.AgentID, agent.circuitcode, teleportFlags, agent.startpos); | 3413 | agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, teleportFlags, agent.startpos); |
3414 | 3414 | ||
3415 | if (LoginsDisabled) | 3415 | if (LoginsDisabled) |
3416 | { | 3416 | { |