Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2013-05-11 01:29:30 +0100
committer: Melanie 2013-05-11 01:29:30 +0100
commit: 55c9bc15e571065f66190e017f973f6e1ac43428 (patch)
tree: 537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
parent: Send up the part missing from the Avination Estate commit. (diff)
parent: BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff)
download: opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.zip
opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz
opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2
opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index 6cc7ff2..1b960b1 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Tests.Common
                Scene neighbourScene;
                SceneManager.Instance.TryGetScene(x, y, out neighbourScene);
-                TestClient neighbourTc = new TestClient(newAgent, neighbourScene, SceneManager.Instance);
+                TestClient neighbourTc = new TestClient(newAgent, neighbourScene);
                neighbourTcs.Add(neighbourTc);
                neighbourScene.AddNewClient(neighbourTc, PresenceType.User);
            };
author	Melanie	2013-05-11 01:29:30 +0100
committer	Melanie	2013-05-11 01:29:30 +0100
commit	55c9bc15e571065f66190e017f973f6e1ac43428 (patch)
tree	537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
parent	Send up the part missing from the Avination Estate commit. (diff)
parent	BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff)
download	opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz

diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs index 6cc7ff2..1b960b1 100644 --- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Tests.Common
82	Scene neighbourScene;	82	Scene neighbourScene;
83	SceneManager.Instance.TryGetScene(x, y, out neighbourScene);	83	SceneManager.Instance.TryGetScene(x, y, out neighbourScene);
84		84
85	TestClient neighbourTc = new TestClient(newAgent, neighbourScene, SceneManager.Instance);	85	TestClient neighbourTc = new TestClient(newAgent, neighbourScene);
86	neighbourTcs.Add(neighbourTc);	86	neighbourTcs.Add(neighbourTc);
87	neighbourScene.AddNewClient(neighbourTc, PresenceType.User);	87	neighbourScene.AddNewClient(neighbourTc, PresenceType.User);
88	};	88	};