aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-16 22:09:13 +0100
committerJustin Clark-Casey (justincc)2011-08-16 22:09:13 +0100
commitc58b32e7baf199fd2168851a1f718d5650f31423 (patch)
treebe424cc9bde5b4590028b30ac6e874745a274a7c /OpenSim/Region
parentremove setting up of second scene in attachments since it's not currently used (diff)
downloadopensim-SC_OLD-c58b32e7baf199fd2168851a1f718d5650f31423.zip
opensim-SC_OLD-c58b32e7baf199fd2168851a1f718d5650f31423.tar.gz
opensim-SC_OLD-c58b32e7baf199fd2168851a1f718d5650f31423.tar.bz2
opensim-SC_OLD-c58b32e7baf199fd2168851a1f718d5650f31423.tar.xz
drop number of attachments in test from 3 to 2 to reduce text complexity
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index b008499..2e32377 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
57 public static Random random; 57 public static Random random;
58 public ulong region1; 58 public ulong region1;
59 public AgentCircuitData acd1; 59 public AgentCircuitData acd1;
60 public SceneObjectGroup sog1, sog2, sog3; 60 public SceneObjectGroup sog1, sog2;
61 61
62 [TestFixtureSetUp] 62 [TestFixtureSetUp]
63 public void Init() 63 public void Init()
@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
75 random = new Random(); 75 random = new Random();
76 sog1 = NewSOG(UUID.Random(), scene, agent1); 76 sog1 = NewSOG(UUID.Random(), scene, agent1);
77 sog2 = NewSOG(UUID.Random(), scene, agent1); 77 sog2 = NewSOG(UUID.Random(), scene, agent1);
78 sog3 = NewSOG(UUID.Random(), scene, agent1);
79 78
80 //ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); 79 //ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
81 region1 = scene.RegionInfo.RegionHandle; 80 region1 = scene.RegionInfo.RegionHandle;
@@ -92,7 +91,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
92 91
93 presence.AddAttachment(sog1); 92 presence.AddAttachment(sog1);
94 presence.AddAttachment(sog2); 93 presence.AddAttachment(sog2);
95 presence.AddAttachment(sog3);
96 94
97 Assert.That(presence.HasAttachments(), Is.True); 95 Assert.That(presence.HasAttachments(), Is.True);
98 Assert.That(presence.ValidateAttachments(), Is.True); 96 Assert.That(presence.ValidateAttachments(), Is.True);
@@ -106,7 +104,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
106 ScenePresence presence = scene.GetScenePresence(agent1); 104 ScenePresence presence = scene.GetScenePresence(agent1);
107 presence.RemoveAttachment(sog1); 105 presence.RemoveAttachment(sog1);
108 presence.RemoveAttachment(sog2); 106 presence.RemoveAttachment(sog2);
109 presence.RemoveAttachment(sog3);
110 Assert.That(presence.HasAttachments(), Is.False); 107 Assert.That(presence.HasAttachments(), Is.False);
111 } 108 }
112 109