aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Tests
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-16 12:15:14 -0400
committerTeravus Ovares (Dan Olivares)2009-08-16 12:15:14 -0400
commitacc14c472deeb92e0436ac38d16e3f6e049bc546 (patch)
treeb31fd0fd1992c1ea6cad2cc1123ab2422953372f /OpenSim/Framework/Tests
parent* ShortVersion, another attempt at fixing the test thread death that randomly... (diff)
parent* Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff)
downloadopensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.zip
opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.gz
opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.bz2
opensim-SC_OLD-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Tests')
-rw-r--r--OpenSim/Framework/Tests/AgentCircuitManagerTests.cs2
-rw-r--r--OpenSim/Framework/Tests/ThreadTrackerTests.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
index ab5f04a..6c98897 100644
--- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Tests
64 Vector3 StartPos = new Vector3(5, 23, 125); 64 Vector3 StartPos = new Vector3(5, 23, 125);
65 65
66 UUID SecureSessionId = UUID.Random(); 66 UUID SecureSessionId = UUID.Random();
67 UUID SessionId = UUID.Random(); 67 // TODO: unused: UUID SessionId = UUID.Random();
68 68
69 m_agentCircuitData1 = new AgentCircuitData(); 69 m_agentCircuitData1 = new AgentCircuitData();
70 m_agentCircuitData1.AgentID = AgentId1; 70 m_agentCircuitData1.AgentID = AgentId1;
diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
index 37c75ef..15d5b73 100644
--- a/OpenSim/Framework/Tests/ThreadTrackerTests.cs
+++ b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Framework.Tests
161 /// Worker thread 0 161 /// Worker thread 0
162 /// </summary> 162 /// </summary>
163 /// <param name="o"></param> 163 /// <param name="o"></param>
164 public void run( object o) 164 public void run(object o)
165 { 165 {
166 while (running) 166 while (running)
167 { 167 {