aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBlueWall2012-02-19 12:09:57 -0500
committerBlueWall2012-02-19 12:09:57 -0500
commitbcb95774959edec55cfe757b5de2e7198f176eea (patch)
tree873fba57aa43e452a7a8dc35a8b95afbb99099f2 /OpenSim/Region
parentFix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.... (diff)
downloadopensim-SC_OLD-bcb95774959edec55cfe757b5de2e7198f176eea.zip
opensim-SC_OLD-bcb95774959edec55cfe757b5de2e7198f176eea.tar.gz
opensim-SC_OLD-bcb95774959edec55cfe757b5de2e7198f176eea.tar.bz2
opensim-SC_OLD-bcb95774959edec55cfe757b5de2e7198f176eea.tar.xz
Use localy defined name, TPFlags, for Constants.TeleportFlags
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 13c866d..d2a8ad0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3259,10 +3259,10 @@ namespace OpenSim.Region.Framework.Scenes
3259 /// also return a reason.</returns> 3259 /// also return a reason.</returns>
3260 public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup) 3260 public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup)
3261 { 3261 {
3262 bool vialogin = ((teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0 || 3262 bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 ||
3263 (teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0); 3263 (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0);
3264 bool viahome = ((teleportFlags & (uint)Constants.TeleportFlags.ViaHome) != 0); 3264 bool viahome = ((teleportFlags & (uint)TPFlags.ViaHome) != 0);
3265 bool godlike = ((teleportFlags & (uint)Constants.TeleportFlags.Godlike) != 0); 3265 bool godlike = ((teleportFlags & (uint)TPFlags.Godlike) != 0);
3266 3266
3267 reason = String.Empty; 3267 reason = String.Empty;
3268 3268
@@ -3275,9 +3275,9 @@ namespace OpenSim.Region.Framework.Scenes
3275 3275
3276 // Don't disable this log message - it's too helpful 3276 // Don't disable this log message - it's too helpful
3277 m_log.DebugFormat( 3277 m_log.DebugFormat(
3278 "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags {8}, position {9})", 3278 "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})",
3279 RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname, 3279 RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname,
3280 agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, teleportFlags, agent.startpos); 3280 agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, ((TPFlags)teleportFlags).ToString(), agent.startpos);
3281 3281
3282 if (LoginsDisabled) 3282 if (LoginsDisabled)
3283 { 3283 {