From 36dcfd2b80b36dc2cc6aa350b0c8102347c28ccc Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sun, 11 Oct 2009 10:23:16 -0700
Subject: [PATCH] * Changed logic of enabling LLProxyLoginModule to follow the
 new style -- true/false on the name, rather than gridmode=true. * Better
 error messages on Add/Remove clients.

---
 OpenSim/Client/Linden/LLProxyLoginModule.cs         | 4 ++--
 OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 6 ++++--
 bin/config-include/Grid.ini                         | 1 +
 bin/config-include/GridHypergrid.ini                | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index f9cb3a9337..2da774f755 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Client.Linden
 
         public void Initialise(IConfigSource source)
         {
-            IConfig startupConfig = source.Configs["Startup"];
+            IConfig startupConfig = source.Configs["Modules"];
             if (startupConfig != null)
             {
-                m_enabled = startupConfig.GetBoolean("gridmode", false);
+                m_enabled = startupConfig.GetBoolean("LLProxyLoginModule", false);
             }
         }
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 03902770ed..c356f02957 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             LLUDPClient udpClient;
             if (clients.TryGetValue(client.AgentId, out udpClient))
             {
-                m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + client.Name);
+                m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + client.Name + " in " + m_scene.RegionInfo.RegionName);
                 udpClient.Shutdown();
                 clients.Remove(client.AgentId, udpClient.RemoteEndPoint);
             }
@@ -525,7 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Determine which agent this packet came from
             if (!clients.TryGetValue(address, out client))
             {
-                m_log.Warn("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address);
+                m_log.Warn("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
                 return;
             }
 
@@ -668,6 +668,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // Add the new client to our list of tracked clients
             clients.Add(agentID, client.RemoteEndPoint, client);
+
+            m_log.DebugFormat("[LLUDPSERVER]: Added new client {0} to region {1}", agentID, m_scene.RegionInfo.RegionName);
         }
 
         private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend)
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 261c1b8d48..5b19130cfd 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -15,6 +15,7 @@
     GridServices = "RemoteGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
+    LLProxyLoginModule = true
 
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index f5aa603d30..a5fe6e9d49 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -18,6 +18,7 @@
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
     HypergridServiceInConnector = true
+    LLProxyLoginModule = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"