diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6274e02..a2322b7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3395,10 +3395,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
3395 | /// also return a reason.</returns> | 3395 | /// also return a reason.</returns> |
3396 | public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup) | 3396 | public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup) |
3397 | { | 3397 | { |
3398 | bool vialogin = ((teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0 || | 3398 | bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 || |
3399 | (teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0); | 3399 | (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0); |
3400 | bool viahome = ((teleportFlags & (uint)Constants.TeleportFlags.ViaHome) != 0); | 3400 | bool viahome = ((teleportFlags & (uint)TPFlags.ViaHome) != 0); |
3401 | bool godlike = ((teleportFlags & (uint)Constants.TeleportFlags.Godlike) != 0); | 3401 | bool godlike = ((teleportFlags & (uint)TPFlags.Godlike) != 0); |
3402 | 3402 | ||
3403 | reason = String.Empty; | 3403 | reason = String.Empty; |
3404 | 3404 | ||
@@ -3411,9 +3411,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3411 | 3411 | ||
3412 | // Don't disable this log message - it's too helpful | 3412 | // Don't disable this log message - it's too helpful |
3413 | m_log.DebugFormat( | 3413 | m_log.DebugFormat( |
3414 | "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags {8}, position {9})", | 3414 | "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})", |
3415 | RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname, | 3415 | RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname, |
3416 | agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, teleportFlags, agent.startpos); | 3416 | agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, ((TPFlags)teleportFlags).ToString(), agent.startpos); |
3417 | 3417 | ||
3418 | if (LoginsDisabled) | 3418 | if (LoginsDisabled) |
3419 | { | 3419 | { |