aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-03 17:50:05 +0000
committerJustin Clark-Casey (justincc)2010-03-03 17:50:05 +0000
commit1c68ad2bba43b87e204cf6eafb7f0a31d3272c01 (patch)
tree96e43dfc67d3ce0fb25dbf180a85517263f77c00
parentAdded empty service URLs upon account creation. (diff)
downloadopensim-SC_OLD-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.zip
opensim-SC_OLD-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.tar.gz
opensim-SC_OLD-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.tar.bz2
opensim-SC_OLD-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.tar.xz
remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
this allows the tests to pass on my local system
Diffstat (limited to '')
-rw-r--r--.nant/local.include22
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs16
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
3 files changed, 14 insertions, 26 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 5e02665..c611bd2 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -43,11 +43,6 @@
43 </exec> 43 </exec>
44 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 44 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
45 45
46 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.communications.tests">
47 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
48 </exec>
49 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
50
51 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests"> 46 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests">
52 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" /> 47 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
53 </exec> 48 </exec>
@@ -106,17 +101,6 @@
106 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" /> 101 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
107 </exec> 102 </exec>
108 103
109 <exec program="mono">
110 <arg value="--debug" />
111 <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Communications.cov,+[OpenSim.Framework.Communications]" />
112 <arg value="/usr/lib/nunit/nunit-console.exe" />
113 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
114 </exec>
115 <delete dir="./cov/OpenSim.Framework.Communications" />
116 <exec program="monocov">
117 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" />
118 </exec>
119
120<!-- 104<!--
121 <exec program="mono"> 105 <exec program="mono">
122 <arg value="&#45;&#45;debug" /> 106 <arg value="&#45;&#45;debug" />
@@ -227,11 +211,6 @@
227 <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" /> 211 <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
228 </exec> 212 </exec>
229 213
230 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
231 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
232 <arg value="-xml=test-results/OpenSim.Framework.Communications.Tests.dll-Results.xml" />
233 </exec>
234
235 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests"> 214 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests">
236 <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" /> 215 <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" />
237 <arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" /> 216 <arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" />
@@ -301,7 +280,6 @@
301<!-- <test> --> 280<!-- <test> -->
302<!-- <assemblies> --> 281<!-- <assemblies> -->
303<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> --> 282<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
304<!-- <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> -->
305<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> --> 283<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
306<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> --> 284<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
307<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> --> 285<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> -->
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ef49205..569dc8d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -97,6 +97,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
97 /// </summary> 97 /// </summary>
98 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector 98 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector
99 { 99 {
100 /// <value>
101 /// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets).
102 /// </value>
103 protected int m_debugPacketLevel = 0;
104
100 #region Events 105 #region Events
101 106
102 public event GenericMessage OnGenericMessage; 107 public event GenericMessage OnGenericMessage;
@@ -472,6 +477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
472 477
473 public void SetDebugPacketLevel(int newDebug) 478 public void SetDebugPacketLevel(int newDebug)
474 { 479 {
480 m_debugPacketLevel = newDebug;
475 } 481 }
476 482
477 #region Client Methods 483 #region Client Methods
@@ -10952,7 +10958,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10952 LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length); 10958 LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length);
10953 #endregion BinaryStats 10959 #endregion BinaryStats
10954 10960
10955 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); 10961 OutPacket(packet, throttlePacketType, true);
10956 } 10962 }
10957 10963
10958 /// <summary> 10964 /// <summary>
@@ -10965,6 +10971,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10965 /// handles splitting manually</param> 10971 /// handles splitting manually</param>
10966 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) 10972 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
10967 { 10973 {
10974 if (m_debugPacketLevel >= 255)
10975 m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type);
10976
10968 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); 10977 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
10969 } 10978 }
10970 10979
@@ -11036,10 +11045,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11036 /// <param name="Pack">OpenMetaverse.packet</param> 11045 /// <param name="Pack">OpenMetaverse.packet</param>
11037 public void ProcessInPacket(Packet Pack) 11046 public void ProcessInPacket(Packet Pack)
11038 { 11047 {
11039// m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack); 11048 if (m_debugPacketLevel >= 255)
11049 m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type);
11040 11050
11041 if (!ProcessPacketMethod(Pack)) 11051 if (!ProcessPacketMethod(Pack))
11042 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 11052 m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type);
11043 11053
11044 PacketPool.Instance.ReturnPacket(Pack); 11054 PacketPool.Instance.ReturnPacket(Pack);
11045 } 11055 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 6395d98..680c39a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Framework.Scenes
422 422
423 if (!scenePresence.IsChildAgent) 423 if (!scenePresence.IsChildAgent)
424 { 424 {
425 m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", 425 m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
426 scenePresence.Firstname, 426 scenePresence.Firstname,
427 scenePresence.Lastname, 427 scenePresence.Lastname,
428 newDebug); 428 newDebug);