diff options
| author | Melanie | 2013-05-11 01:29:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 01:29:30 +0100 |
| commit | 55c9bc15e571065f66190e017f973f6e1ac43428 (patch) | |
| tree | 537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Region/CoreModules | |
| 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_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 7d16635..f69ec21 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -776,7 +776,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 776 | m_scene.ForEachClient( | 776 | m_scene.ForEachClient( |
| 777 | client => | 777 | client => |
| 778 | { if (client.AgentId != so.AttachedAvatar) | 778 | { if (client.AgentId != so.AttachedAvatar) |
| 779 | client.SendKillObject(m_scene.RegionInfo.RegionHandle, new List<uint>() { so.LocalId }); | 779 | client.SendKillObject(new List<uint>() { so.LocalId }); |
| 780 | }); | 780 | }); |
| 781 | } | 781 | } |
| 782 | 782 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 25444e5..508743c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
| @@ -833,11 +833,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
| 833 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); | 833 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); |
| 834 | 834 | ||
| 835 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); | 835 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); |
| 836 | TestClient tc = new TestClient(acd, sceneA, sh.SceneManager); | 836 | TestClient tc = new TestClient(acd, sceneA); |
| 837 | List<TestClient> destinationTestClients = new List<TestClient>(); | 837 | List<TestClient> destinationTestClients = new List<TestClient>(); |
| 838 | EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients); | 838 | EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients); |
| 839 | 839 | ||
| 840 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd, sh.SceneManager); | 840 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd); |
| 841 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); | 841 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); |
| 842 | 842 | ||
| 843 | InventoryItemBase attItem = CreateAttachmentItem(sceneA, ua1.PrincipalID, "att", 0x10, 0x20); | 843 | InventoryItemBase attItem = CreateAttachmentItem(sceneA, ua1.PrincipalID, "att", 0x10, 0x20); |