aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-03 17:50:05 +0000
committerJustin Clark-Casey (justincc)2010-06-08 16:10:40 +0100
commit052445806911288b49c36065575556559fe4963e (patch)
tree6eae06de589ffa3bbf90c4ba33a371ae399d4f36
parentMerge branch '0.6.9-post-fixes' into share-with-group (diff)
downloadopensim-SC_OLD-052445806911288b49c36065575556559fe4963e.zip
opensim-SC_OLD-052445806911288b49c36065575556559fe4963e.tar.gz
opensim-SC_OLD-052445806911288b49c36065575556559fe4963e.tar.bz2
opensim-SC_OLD-052445806911288b49c36065575556559fe4963e.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
-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 3db063b..6f0a362 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -95,11 +95,6 @@
95 </exec> 95 </exec>
96 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 96 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
97 97
98 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.communications.tests">
99 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
100 </exec>
101 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
102
103 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests"> 98 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.framework.servers.tests">
104 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" /> 99 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
105 </exec> 100 </exec>
@@ -160,17 +155,6 @@
160 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" /> 155 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
161 </exec> 156 </exec>
162 157
163 <exec program="mono">
164 <arg value="--debug" />
165 <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Communications.cov,+[OpenSim.Framework.Communications]" />
166 <arg value="/usr/lib/nunit/nunit-console.exe" />
167 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
168 </exec>
169 <delete dir="./cov/OpenSim.Framework.Communications" />
170 <exec program="monocov">
171 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" />
172 </exec>
173
174<!-- 158<!--
175 <exec program="mono"> 159 <exec program="mono">
176 <arg value="&#45;&#45;debug" /> 160 <arg value="&#45;&#45;debug" />
@@ -281,11 +265,6 @@
281 <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" /> 265 <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
282 </exec> 266 </exec>
283 267
284 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
285 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
286 <arg value="-xml=test-results/OpenSim.Framework.Communications.Tests.dll-Results.xml" />
287 </exec>
288
289 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests"> 268 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.serialization.tests">
290 <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" /> 269 <arg value="./bin/OpenSim.Framework.Serialization.Tests.dll" />
291 <arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" /> 270 <arg value="-xml=test-results/OpenSim.Framework.Serialization.Tests.dll-Results.xml" />
@@ -355,7 +334,6 @@
355<!-- <test> --> 334<!-- <test> -->
356<!-- <assemblies> --> 335<!-- <assemblies> -->
357<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> --> 336<!-- <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
358<!-- <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> -->
359<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> --> 337<!-- <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
360<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> --> 338<!-- <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
361<!-- <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> --> 339<!-- <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 ec238ef..58aa26a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -98,6 +98,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
98 /// </summary> 98 /// </summary>
99 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector 99 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector
100 { 100 {
101 /// <value>
102 /// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets).
103 /// </value>
104 protected int m_debugPacketLevel = 0;
105
101 #region Events 106 #region Events
102 107
103 public event GenericMessage OnGenericMessage; 108 public event GenericMessage OnGenericMessage;
@@ -490,6 +495,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
490 495
491 public void SetDebugPacketLevel(int newDebug) 496 public void SetDebugPacketLevel(int newDebug)
492 { 497 {
498 m_debugPacketLevel = newDebug;
493 } 499 }
494 500
495 #region Client Methods 501 #region Client Methods
@@ -11080,7 +11086,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11080 LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length); 11086 LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length);
11081 #endregion BinaryStats 11087 #endregion BinaryStats
11082 11088
11083 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); 11089 OutPacket(packet, throttlePacketType, true);
11084 } 11090 }
11085 11091
11086 /// <summary> 11092 /// <summary>
@@ -11093,6 +11099,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11093 /// handles splitting manually</param> 11099 /// handles splitting manually</param>
11094 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) 11100 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
11095 { 11101 {
11102 if (m_debugPacketLevel >= 255)
11103 m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type);
11104
11096 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); 11105 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
11097 } 11106 }
11098 11107
@@ -11164,10 +11173,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11164 /// <param name="Pack">OpenMetaverse.packet</param> 11173 /// <param name="Pack">OpenMetaverse.packet</param>
11165 public void ProcessInPacket(Packet Pack) 11174 public void ProcessInPacket(Packet Pack)
11166 { 11175 {
11167// m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack); 11176 if (m_debugPacketLevel >= 255)
11177 m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type);
11168 11178
11169 if (!ProcessPacketMethod(Pack)) 11179 if (!ProcessPacketMethod(Pack))
11170 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 11180 m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type);
11171 11181
11172 PacketPool.Instance.ReturnPacket(Pack); 11182 PacketPool.Instance.ReturnPacket(Pack);
11173 } 11183 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c2e3370..92c278e 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);