diff options
| author | Melanie | 2011-12-05 17:10:51 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 17:10:51 +0000 |
| commit | 5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch) | |
| tree | 537b010672277073530cf013434fa046aabfec7e /OpenSim/Framework/Tests | |
| parent | Strip CR from http responses and limit them to 2048 chars (diff) | |
| parent | HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff) | |
| download | opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2 opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz | |
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 | ||||
| -rw-r--r-- | OpenSim/Framework/Tests/AnimationTests.cs | 2 |
2 files changed, 0 insertions, 4 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 | } |
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs index aa4c6aa..967a355 100644 --- a/OpenSim/Framework/Tests/AnimationTests.cs +++ b/OpenSim/Framework/Tests/AnimationTests.cs | |||
| @@ -87,8 +87,6 @@ namespace OpenSim.Framework.Tests | |||
| 87 | anim4.SequenceNum = anim2.SequenceNum; | 87 | anim4.SequenceNum = anim2.SequenceNum; |
| 88 | 88 | ||
| 89 | Assert.That(anim4.ObjectID == objUUID2 && anim4.AnimID == animUUID2 && anim4.SequenceNum == 1, "void constructor and manual field population failed to set the properties correctly."); | 89 | Assert.That(anim4.ObjectID == objUUID2 && anim4.AnimID == animUUID2 && anim4.SequenceNum == 1, "void constructor and manual field population failed to set the properties correctly."); |
| 90 | |||
| 91 | |||
| 92 | } | 90 | } |
| 93 | } | 91 | } |
| 94 | } \ No newline at end of file | 92 | } \ No newline at end of file |