2 files changed, 1 insertions, 3 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 20452e0..1f1f88b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <value>
         /// The endpoint of a sender of a particular packet.  The port is changed by the various socket receive methods
         /// </value>
-        protected EndPoint epSender;
+        protected EndPoint epSender = new IPEndPoint(IPAddress.Any, 0);
 
         protected EndPoint epProxy;
         protected int proxyPortOffset;
@@ -175,7 +175,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="result"></param>
         protected virtual void OnReceivedData(IAsyncResult result)
         {
-            epSender = new IPEndPoint(listenIP, 0);
             Packet packet = null;
 
             int numBytes = 1;
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index ab86d10..cec2ec1 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -34,7 +34,6 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Data.Base;
-using OpenSim.Data.MapperFactory;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Environment.Interfaces;