aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-10-11 10:23:16 -0700
committerDiva Canto2009-10-11 10:23:16 -0700
commit36dcfd2b80b36dc2cc6aa350b0c8102347c28ccc (patch)
tree3d3271b7c099037c12dc29b0fb9742b6201be9c9
parentsync PrimMesher with r46 (diff)
downloadopensim-SC_OLD-36dcfd2b80b36dc2cc6aa350b0c8102347c28ccc.zip
opensim-SC_OLD-36dcfd2b80b36dc2cc6aa350b0c8102347c28ccc.tar.gz
opensim-SC_OLD-36dcfd2b80b36dc2cc6aa350b0c8102347c28ccc.tar.bz2
opensim-SC_OLD-36dcfd2b80b36dc2cc6aa350b0c8102347c28ccc.tar.xz
* 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.
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs6
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridHypergrid.ini1
4 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index f9cb3a9..2da774f 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -76,10 +76,10 @@ namespace OpenSim.Client.Linden
76 76
77 public void Initialise(IConfigSource source) 77 public void Initialise(IConfigSource source)
78 { 78 {
79 IConfig startupConfig = source.Configs["Startup"]; 79 IConfig startupConfig = source.Configs["Modules"];
80 if (startupConfig != null) 80 if (startupConfig != null)
81 { 81 {
82 m_enabled = startupConfig.GetBoolean("gridmode", false); 82 m_enabled = startupConfig.GetBoolean("LLProxyLoginModule", false);
83 } 83 }
84 } 84 }
85 85
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 0390277..c356f02 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
189 LLUDPClient udpClient; 189 LLUDPClient udpClient;
190 if (clients.TryGetValue(client.AgentId, out udpClient)) 190 if (clients.TryGetValue(client.AgentId, out udpClient))
191 { 191 {
192 m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + client.Name); 192 m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + client.Name + " in " + m_scene.RegionInfo.RegionName);
193 udpClient.Shutdown(); 193 udpClient.Shutdown();
194 clients.Remove(client.AgentId, udpClient.RemoteEndPoint); 194 clients.Remove(client.AgentId, udpClient.RemoteEndPoint);
195 } 195 }
@@ -525,7 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
525 // Determine which agent this packet came from 525 // Determine which agent this packet came from
526 if (!clients.TryGetValue(address, out client)) 526 if (!clients.TryGetValue(address, out client))
527 { 527 {
528 m_log.Warn("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address); 528 m_log.Warn("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
529 return; 529 return;
530 } 530 }
531 531
@@ -668,6 +668,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
668 668
669 // Add the new client to our list of tracked clients 669 // Add the new client to our list of tracked clients
670 clients.Add(agentID, client.RemoteEndPoint, client); 670 clients.Add(agentID, client.RemoteEndPoint, client);
671
672 m_log.DebugFormat("[LLUDPSERVER]: Added new client {0} to region {1}", agentID, m_scene.RegionInfo.RegionName);
671 } 673 }
672 674
673 private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend) 675 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 261c1b8..5b19130 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -15,6 +15,7 @@
15 GridServices = "RemoteGridServicesConnector" 15 GridServices = "RemoteGridServicesConnector"
16 NeighbourServiceInConnector = true 16 NeighbourServiceInConnector = true
17 LandServiceInConnector = true 17 LandServiceInConnector = true
18 LLProxyLoginModule = true
18 19
19[GridService] 20[GridService]
20 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 21 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index f5aa603..a5fe6e9 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -18,6 +18,7 @@
18 NeighbourServiceInConnector = true 18 NeighbourServiceInConnector = true
19 LandServiceInConnector = true 19 LandServiceInConnector = true
20 HypergridServiceInConnector = true 20 HypergridServiceInConnector = true
21 LLProxyLoginModule = true
21 22
22[AssetService] 23[AssetService]
23 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 24 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"