diff options
| author | Justin Clark-Casey (justincc) | 2011-12-03 18:59:54 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-12-03 18:59:54 +0000 |
| commit | 4919c6056022053f8632b030a06fd8f48ac02a8e (patch) | |
| tree | 098bfeaf1aa751f20e2bc4791f26302e74417d05 /OpenSim/Region/CoreModules/Framework | |
| parent | Improve locking in AgentCircuitManager (diff) | |
| download | opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.zip opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.tar.gz opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.tar.bz2 opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.tar.xz | |
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 99064c8..2f947fd 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1341,7 +1341,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1341 | 1341 | ||
| 1342 | string reason = String.Empty; | 1342 | string reason = String.Empty; |
| 1343 | 1343 | ||
| 1344 | |||
| 1345 | bool regionAccepted = m_scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); | 1344 | bool regionAccepted = m_scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); |
| 1346 | 1345 | ||
| 1347 | if (regionAccepted && newAgent) | 1346 | if (regionAccepted && newAgent) |