diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Tests/AgentCircuitManagerTests.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs index 9615f1b..ae132c8 100644 --- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs +++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs | |||
| @@ -194,8 +194,6 @@ namespace OpenSim.Framework.Tests | |||
| 194 | 194 | ||
| 195 | resp = agentCircuitManager.AuthenticateSession(SessionId2, AgentId2, circuitcode2); | 195 | resp = agentCircuitManager.AuthenticateSession(SessionId2, AgentId2, circuitcode2); |
| 196 | Assert.That(!resp.Authorised); | 196 | Assert.That(!resp.Authorised); |
| 197 | |||
| 198 | } | 197 | } |
| 199 | |||
| 200 | } | 198 | } |
| 201 | } | 199 | } |