Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

1 files changed, 0 insertions, 15 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f80a00f..67ce48e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -92,23 +92,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event ObjectDeselect OnObjectDetach;
         public event ObjectDrop OnObjectDrop;
         public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
-
-        /// <summary>
-        /// Called when an AgentUpdate message is received and before OnAgentUpdate.
-        /// </summary>
-        /// <remarks>
-        /// Listeners must not retain a reference to AgentUpdateArgs since this object is reused for subsequent AgentUpdates.
-        /// </remarks>
         public event UpdateAgent OnPreAgentUpdate;
-
-        /// <summary>
-        /// Called when an AgentUpdate message is received and after OnPreAgentUpdate.
-        /// </summary>
-        /// <remarks>
-        /// Listeners must not retain a reference to AgentUpdateArgs since this object is reused for subsequent AgentUpdates.
-        /// </remarks>
         public event UpdateAgent OnAgentUpdate;
-
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
         public event AvatarPickerRequest OnAvatarPickerRequest;