diff options
| author | Melanie | 2012-05-02 01:37:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-02 01:37:51 +0100 |
| commit | bf630fb808420c15abc100f11b993b9e6e1113c2 (patch) | |
| tree | 11a10a97e78725e96807c01a656123f934acb04a /OpenSim/Region/ClientStack/Linden/UDP | |
| parent | Merge branch 'avination' (diff) | |
| parent | Comment out the five second sleep in etm.DoTeleport() if the old agent needs ... (diff) | |
| download | opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.zip opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.gz opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.bz2 opensim-SC_OLD-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs index 221f02b..5fcf376 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | |||
| @@ -79,7 +79,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
| 79 | 79 | ||
| 80 | J2KDecoderModule j2kdm = new J2KDecoderModule(); | 80 | J2KDecoderModule j2kdm = new J2KDecoderModule(); |
| 81 | 81 | ||
| 82 | scene = new SceneHelpers().SetupScene(); | 82 | SceneHelpers sceneHelpers = new SceneHelpers(); |
| 83 | scene = sceneHelpers.SetupScene(); | ||
| 83 | SceneHelpers.SetupSceneModules(scene, j2kdm); | 84 | SceneHelpers.SetupSceneModules(scene, j2kdm); |
| 84 | 85 | ||
| 85 | tc = new TestClient(SceneHelpers.GenerateAgentData(userId), scene); | 86 | tc = new TestClient(SceneHelpers.GenerateAgentData(userId), scene); |