aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-15 17:40:04 +0000
committerJustin Clarke Casey2009-04-15 17:40:04 +0000
commitfa9b9126ee85fd1124634dae41c8ac58ba4fe70f (patch)
tree80c9b16f54ce909e1a765e6eeabe634ee9a57d48
parentAnother cleanup: Region_Status renamed to RegionStatus, and a usage comment a... (diff)
downloadopensim-SC-fa9b9126ee85fd1124634dae41c8ac58ba4fe70f.zip
opensim-SC-fa9b9126ee85fd1124634dae41c8ac58ba4fe70f.tar.gz
opensim-SC-fa9b9126ee85fd1124634dae41c8ac58ba4fe70f.tar.bz2
opensim-SC-fa9b9126ee85fd1124634dae41c8ac58ba4fe70f.tar.xz
* Resolve unit test failure introduced in r9148 (probably)
* Have the test scene always return success for session id authentication for now
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs13
2 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b650b79..2ed384f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -213,7 +213,6 @@ namespace OpenSim.Region.Framework.Scenes
213 PhysicsScene.OnJointDeactivated += jointDeactivated; 213 PhysicsScene.OnJointDeactivated += jointDeactivated;
214 PhysicsScene.OnJointErrorMessage += jointErrorMessage; 214 PhysicsScene.OnJointErrorMessage += jointErrorMessage;
215 } 215 }
216
217 } 216 }
218 } 217 }
219 218
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 12cce9d..0be98a2 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -46,6 +46,19 @@ namespace OpenSim.Tests.Common.Mock
46 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) 46 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
47 { 47 {
48 } 48 }
49
50 /// <summary>
51 /// Temporarily override session authentication for tests (namely teleport).
52 /// </summary>
53 ///
54 /// TODO: This needs to be mocked out properly.
55 ///
56 /// <param name="agent"></param>
57 /// <returns></returns>
58 public override bool AuthenticateUser(AgentCircuitData agent)
59 {
60 return true;
61 }
49 62
50 public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter 63 public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
51 { 64 {