From 82ad9d4e04867b23b4c824c4eca7402bf476f0b7 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Mon, 16 Jan 2012 22:58:58 +0000
Subject: [PATCH] Remove monocov and other obsolete nant build targets.

monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
---
 .nant/local.include                           | 186 ------------------
 OpenSim/Framework/IClientAPI.cs               |   8 +
 .../ClientStack/Linden/UDP/LLClientView.cs    |  15 +-
 .../Region/Framework/Scenes/ScenePresence.cs  |   2 +-
 bin/OpenSim.exe.config                        |   2 +-
 5 files changed, 20 insertions(+), 193 deletions(-)

diff --git a/.nant/local.include b/.nant/local.include
index a9ba17d8e8..0c23e50eed 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -38,52 +38,8 @@
       <include name=".hgignore"/>
     </fileset>
   </delete>
-  
 </target>
 
-<!-- I don't think these targets are being actively used.  But just in case, we'll just comment them out for now - justincc -->
-<!--
-<property name="projectdir" value="opensim-0.6.9" />
-<target name="dist" depends="distdir">
-    <zip zipfile="${projectdir}.zip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </zip>
-    <tar destfile="${projectdir}.tar.gz" compression="GZip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </tar>
-</target>
-
-<target name="distdir">
-   <delete dir="${projectdir}" />
-   <copy todir="${projectdir}">
-       <fileset basedir=".">
-          <include name="ThirdPartyLicenses/**" />
-          <include name="CONTRIBUTORS.txt" />
-          <include name="README" />
-          <include name="OpenSim/**/*.cs" />
-          <include name="**/*.build" />
-          <include name="**/*.csproj" />
-          <include name="**/*.csproj.user" />
-          <include name="**/*.sln" />
-          <include name="bin/*.dll" />
-          <include name="bin/*.so" />
-          <include name="bin/*.config" />
-          <include name="bin/assets/**" />
-          <include name="bin/data/**" />
-          <include name="bin/OpenSim*xml" />
-          <include name="bin/OpenSim.ini" />
-          <include name="bin/defaultstripe.png" />
-          <exclude name="bin/OpenSim.*dll" />
-       </fileset>
-   </copy>
-   <touch file="${projectdir}/bin/startup_commands.txt" />
-</target>
--->
-
 <target name="test" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
 
@@ -153,116 +109,6 @@
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
 
   <delete dir="%temp%"/>
-
-</target>
-
-<target name="test-cov" depends="build">
-    <!-- Code Coverage Test. Prototype, only works with mono 1.2. Instructions in http://opensimulator.org/wiki/Automated_Testing -->
-    <mkdir dir="cov" failonerror="false" />
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Servers.cov,+[OpenSim.Framework.Servers]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Framework.Servers" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
-    </exec>
-
-<!--
-    <exec program="mono">
-      <arg value="&#45;&#45;debug" />
-      <arg value="&#45;&#45;profile=monocov:outfile=./cov/OpenSim.Region.ClientStack.LindenUDP.cov,+[OpenSim.Region.ClientStack.LindenUDP]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-     <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ClientStack.LindenUDP" />
-    <exec program="monocov">
-      <arg value="&#45;&#45;export-html=./cov/OpenSim.Region.ClientStack.LindenUDP ./cov/OpenSim.Region.ClientStack.LindenUDP.cov" />
-    </exec>
--->
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.cov,+[OpenSim.Region.ScriptEngine.Shared]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared" />
-    <exec program="monocov">      
-      <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared ./cov/OpenSim.Region.ScriptEngine.Shared.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov,+[OpenSim.Region.ScriptEngine.Shared.CodeTools]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools ./cov/OpenSim.Region.ScriptEngine.Shared.CodeTools.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.CoreModules.cov,+[OpenSim.Region.CoreModules]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.CoreModules" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.CoreModules ./cov/OpenSim.Region.CoreModules.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.OptionalModules.cov,+[OpenSim.Region.OptionalModules]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.OptionalModules" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.OptionalModules ./cov/OpenSim.Region.OptionalModules.cov" />
-    </exec>    
-
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Framework.cov,+[OpenSim.Region.Framework]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Region.Framework" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Region.Framework ./cov/OpenSim.Region.Framework.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.SQLite.cov,+[OpenSim.Data.SQLite]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
-    </exec>
-    <delete dir="./cov/OpenSim.Data.SQLite" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Data.SQLite ./cov/OpenSim.Data.SQLite.cov" />
-    </exec>    
-    
-    <exec program="mono">
-      <arg value="--debug" />
-      <arg value="--profile=monocov:outfile=./cov/OpenSim.Data.MySQL.cov,+[OpenSim.Data.MySQL.Tests]" />
-      <arg value="/usr/lib/nunit/nunit-console.exe" />
-      <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
-    </exec>  
-    <delete dir="./cov/OpenSim.Data.MySQL" />
-    <exec program="monocov">
-      <arg value="--export-html=./cov/OpenSim.Data.MySQL ./cov/OpenSim.Data.MySQL.cov" />
-    </exec>     
-
-    <delete file="C:\NUnitPrimaryTrace.txt" failonerror="false" />
-    <delete file="TestResult.xml" failonerror="false" />
-
 </target>
 
 <target name="find-nunit">
@@ -275,15 +121,12 @@
     if="${int::parse(hasnunit2)==0}" />
   <property name="nunitcmd" value="nunit-console"
     if="${int::parse(hasnunit2)==1}" />
-
 </target>
 
 <!-- this is used for panda test execution -->
 <!-- work in progress -->
 
 <target name="test-xml" depends="build, find-nunit">
-  
-
   <mkdir dir="test-results" failonerror="false" />
   <!-- Unit Test Assembly -->
   <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests">
@@ -356,36 +199,7 @@
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
-
 </target>
-<!--     <exec program="nunit-console.exe" failonerror="false" resultproperty="testresult.acceptancetestassembly"> -->
-<!--         <arg value="AcceptanceTestAssembly.dll" /> -->
-<!--         <arg value="/xml=AcceptanceTestAssembly-Results.xml" /> -->
-<!--     </exec> -->
-
-<!--     <fail message="Failures reported in unit tests." unless="${int::parse(testresult.unittestassembly)==0}" /> -->
-<!--     <fail message="Failures reported in acceptance tests." unless="${int::parse(testresult.acceptancetestassembly)==0}" /> -->
-<!-- </target> -->
-
-
-
-<!--       <nunit2 failonerror="true" verbose="true"> -->
-<!--       <formatter type="Xml" usefile="true" extension=".xml" outputdir="./test-results" /> -->
-<!--       <test> -->
-<!--         <assemblies> -->
-<!--           <include name="./bin/OpenSim.Framework.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> -->
-<!--           <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> -->
-<!--         </assemblies> -->
-<!--       </test> -->
-<!--     </nunit2> -->
-<!-- </target> -->
 
 <target name="doxygen">
   <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" />
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 258b3ebb59..29a69c31f7 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1074,7 +1074,15 @@ namespace OpenSim.Framework
         void SendWindData(Vector2[] windSpeeds);
         void SendCloudData(float[] cloudCover);
 
+        /// <summary>
+        /// Sent when an agent completes its movement into a region.
+        /// </summary>
+        /// <remarks>
+        /// This packet marks completion of the arrival of a root avatar in a region, whether through login, region
+        /// crossing or direct teleport.
+        /// </remarks>
         void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
+
         void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
         
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1e72aa20c8..2553b3a165 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -762,9 +762,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(handshake, ThrottleOutPacketType.Task);
         }
 
-        /// <summary>
-        ///
-        /// </summary>
         public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
         {
             AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
@@ -3480,6 +3477,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
         {
+            m_log.DebugFormat(
+                "[LLCLIENTVIEW]: Sending avatar appearance for {0} with {1} bytes to {2} {3}",
+                agentID, textureEntry.Length, Name, AgentId);
+
             AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
             // TODO: don't create new blocks if recycling an old packet
             avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
@@ -3501,7 +3502,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
         {
-            //m_log.DebugFormat("[CLIENT]: Sending animations to {0}", Name);
+//            m_log.DebugFormat("[LLCLIENTVIEW]: Sending animations for {0} to {1}", sourceAgentId, Name);
 
             AvatarAnimationPacket ani = (AvatarAnimationPacket)PacketPool.Instance.GetPacket(PacketType.AvatarAnimation);
             // TODO: don't create new blocks if recycling an old packet
@@ -3536,6 +3537,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
+            m_log.DebugFormat(
+                "[LLCLIENTVIEW]: Sending immediate object update for avatar {0} {1} to {2} {3}",
+                avatar.Name, avatar.UUID, Name, AgentId);
+            
             ScenePresence presence = avatar as ScenePresence;
             if (presence == null)
                 return;
@@ -3545,7 +3550,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             objupdate.RegionData.RegionHandle = presence.RegionHandle;
             objupdate.RegionData.TimeDilation = ushort.MaxValue;
-
+            
             objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
             objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3c9bde8000..230cf91172 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_callbackURI = null;
             }
 
-            //m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
+            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
 
             ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
             ValidateAndSendAppearanceAndAgentData();
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 4a49fc5631..40b18a7703 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -12,7 +12,7 @@
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message" />
+        <conversionPattern value="%date{HH:mm:ss.fff} - %message" />
         <!-- console log with milliseconds.  Useful for debugging -->
 <!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
       </layout>