Merge branch 'master' into careminster-presence-refactor

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 6d3c64a..247dd7e 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -238,8 +238,12 @@ namespace OpenSim.Services.Connectors.Hypergrid
             args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
             args["destination_name"] = OSD.FromString(destination.RegionName);
             args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
-            if (ipaddress != null)
-                args["client_ip"] = OSD.FromString(ipaddress.Address.ToString());
+
+            // 10/3/2010
+            // I added the client_ip up to the regular AgentCircuitData, so this doesn't need to be here.
+            // This need cleaning elsewhere...
+            //if (ipaddress != null)
+            //    args["client_ip"] = OSD.FromString(ipaddress.Address.ToString());
 
             return args;
         }