OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
prioritization
Diva Canto 2009-10-11 10:23:16 -07:00
parent 7b4183d7a0
commit 36dcfd2b80
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Client/Linden/LLProxyLoginModule.cs
View File

@ -76,10 +76,10 @@ namespace OpenSim.Client.Linden
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig startupConfig = source.Configs["Startup"]; IConfig startupConfig = source.Configs["Modules"];
if (startupConfig != null) if (startupConfig != null)
{ {
m_enabled = startupConfig.GetBoolean("gridmode", false); m_enabled = startupConfig.GetBoolean("LLProxyLoginModule", false);
} }
} }

6
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLUDPClient udpClient; LLUDPClient udpClient;
if (clients.TryGetValue(client.AgentId, out 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(); udpClient.Shutdown();
clients.Remove(client.AgentId, udpClient.RemoteEndPoint); clients.Remove(client.AgentId, udpClient.RemoteEndPoint);
} }
@ -525,7 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Determine which agent this packet came from // Determine which agent this packet came from
if (!clients.TryGetValue(address, out client)) 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; return;
} }
@ -668,6 +668,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Add the new client to our list of tracked clients // Add the new client to our list of tracked clients
clients.Add(agentID, client.RemoteEndPoint, client); 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) private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend)

1
bin/config-include/Grid.ini
View File

@ -15,6 +15,7 @@
GridServices = "RemoteGridServicesConnector" GridServices = "RemoteGridServicesConnector"
NeighbourServiceInConnector = true NeighbourServiceInConnector = true
LandServiceInConnector = true LandServiceInConnector = true
LLProxyLoginModule = true
[GridService] [GridService]
LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"

1
bin/config-include/GridHypergrid.ini
View File

@ -18,6 +18,7 @@
NeighbourServiceInConnector = true NeighbourServiceInConnector = true
LandServiceInConnector = true LandServiceInConnector = true
HypergridServiceInConnector = true HypergridServiceInConnector = true
LLProxyLoginModule = true
[AssetService] [AssetService]
LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"