diff options
| author | Diva Canto | 2014-05-23 16:20:04 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-23 16:20:04 -0700 |
| commit | 227685bea437d3e62c305e87415f5183a603d278 (patch) | |
| tree | 017f81fbf28f5944b6d26aa4833b30e1b52c9be7 /OpenSim/Tests/Common/Helpers | |
| parent | Adds optional HTTP Basic Authentication to Robust service connectors. (diff) | |
| parent | Fix issues where reported LSL compiler error line numbers do not match the sc... (diff) | |
| download | opensim-SC-227685bea437d3e62c305e87415f5183a603d278.zip opensim-SC-227685bea437d3e62c305e87415f5183a603d278.tar.gz opensim-SC-227685bea437d3e62c305e87415f5183a603d278.tar.bz2 opensim-SC-227685bea437d3e62c305e87415f5183a603d278.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 874ff62..342cd06 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
| @@ -574,7 +574,11 @@ namespace OpenSim.Tests.Common | |||
| 574 | 574 | ||
| 575 | public static ScenePresence AddChildScenePresence(Scene scene, UUID agentId) | 575 | public static ScenePresence AddChildScenePresence(Scene scene, UUID agentId) |
| 576 | { | 576 | { |
| 577 | AgentCircuitData acd = GenerateAgentData(agentId); | 577 | return AddChildScenePresence(scene, GenerateAgentData(agentId)); |
| 578 | } | ||
| 579 | |||
| 580 | public static ScenePresence AddChildScenePresence(Scene scene, AgentCircuitData acd) | ||
| 581 | { | ||
| 578 | acd.child = true; | 582 | acd.child = true; |
| 579 | 583 | ||
| 580 | // XXX: ViaLogin may not be correct for child agents | 584 | // XXX: ViaLogin may not be correct for child agents |