diff options
author | Diva Canto | 2012-02-19 12:28:47 -0800 |
---|---|---|
committer | Diva Canto | 2012-02-19 12:28:47 -0800 |
commit | dcea23906bec0465ca70be558382bcf7f3c96bb0 (patch) | |
tree | 00f68ade44e1f5d639902bd94b4459575e79f395 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | A few more tweaks on position updates and create child agents. Mono hates con... (diff) | |
parent | Use localy defined name, TPFlags, for Constants.TeleportFlags (diff) | |
download | opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.zip opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.tar.gz opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.tar.bz2 opensim-SC_OLD-dcea23906bec0465ca70be558382bcf7f3c96bb0.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 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 | { |