ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

UserAgentService: change handling of its external IP

Browse Source
This commit is contained in:
UbitUmarov
2019-04-06 16:09:42 +01:00
parent 0ebb1f3f4b
commit b7c1d6e7f5
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@@ -99,15 +99,8 @@ namespace OpenSim.Services.Connectors.Simulation
}
public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason)
{
string tmp = String.Empty;
return CreateAgent(source, destination, aCircuit, flags, ctx, out tmp, out reason);
}
public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string myipaddress, out string reason)
{
reason = String.Empty;
myipaddress = String.Empty;
if (destination == null)
{
@@ -134,7 +127,6 @@ namespace OpenSim.Services.Connectors.Simulation
reason = data["reason"].AsString();
success = data["success"].AsBoolean();
myipaddress = data["your_ip"].AsString();
return success;
}
@@ -149,7 +141,6 @@ namespace OpenSim.Services.Connectors.Simulation
reason = data["reason"].AsString();
success = data["success"].AsBoolean();
myipaddress = data["your_ip"].AsString();
m_log.WarnFormat(
"[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName);
return success;