diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 4abc0f7100..20452e0c69 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -56,10 +56,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected IPEndPoint ServerIncoming;
         protected byte[] RecvBuffer = new byte[4096];
         protected byte[] ZeroBuffer = new byte[8192];
-        protected IPEndPoint ipeSender;
 
         /// <value>
-        /// The endpoint of a sender of a particular packet.  The port is continually changed by the various socket receive methods
+        /// The endpoint of a sender of a particular packet.  The port is changed by the various socket receive methods
         /// </value>
         protected EndPoint epSender;
 
@@ -176,8 +175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="result"></param>
         protected virtual void OnReceivedData(IAsyncResult result)
         {
-            ipeSender = new IPEndPoint(listenIP, 0);
-            epSender = ipeSender;
+            epSender = new IPEndPoint(listenIP, 0);
             Packet packet = null;
 
             int numBytes = 1;
@@ -418,8 +416,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             m_log.Info("[UDPSERVER]: UDP socket bound, getting ready to listen");
 
-            ipeSender = new IPEndPoint(listenIP, 0);
-            epSender = ipeSender;
+            epSender = new IPEndPoint(listenIP, 0);
             ReceivedData = OnReceivedData;
             m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 22a8f5a472..ce7896ee2d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -27,12 +27,13 @@
 
 using System.Net;
 using NUnit.Framework;
+using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.ClientStack.LindenUDP;
 
-namespace OpenSim.Region.ClientStack.LindenUDP.Tests
+namespace OpenSim.Region.ClientStack.LindenUDP
 {
     /// <summary>
     /// This will contain basic tests for the LindenUDP client stack
@@ -47,6 +48,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             
             uint port = 666;            
             llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null);
+            
+            UseCircuitCodePacket uccp = new UseCircuitCodePacket();
+            //llUdpServer.epS
         }
     }
 }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 90285c2819..2108c35c3b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -472,6 +472,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             {
                 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
                     return;
+                
                 // Separating static prim geometry spaces.
                 // We'll be calling near recursivly if one
                 // of them is a space to find all of the
diff --git a/prebuild.xml b/prebuild.xml
index 33d213f4d1..d447ecfb64 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -991,6 +991,7 @@
 
       <ReferencePath>../../../../../bin/</ReferencePath>
       <Reference name="System"/>
+      <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Region.ClientStack"/>