diff options
author | UbitUmarov | 2019-04-06 16:09:42 +0100 |
---|---|---|
committer | UbitUmarov | 2019-04-06 16:09:42 +0100 |
commit | b7c1d6e7f5b4005d5a416e991de32ab67d8e6693 (patch) | |
tree | a655e5c80e706aa51f0e9e9f560f046f8f9c5dc1 /OpenSim/Services/Connectors | |
parent | presence detector: don't even try to logout agents that didn't made to root (diff) | |
download | opensim-SC-b7c1d6e7f5b4005d5a416e991de32ab67d8e6693.zip opensim-SC-b7c1d6e7f5b4005d5a416e991de32ab67d8e6693.tar.gz opensim-SC-b7c1d6e7f5b4005d5a416e991de32ab67d8e6693.tar.bz2 opensim-SC-b7c1d6e7f5b4005d5a416e991de32ab67d8e6693.tar.xz |
UserAgentService: change handling of its external IP
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 4fd1fe5..e15ac8c 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -100,14 +100,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
100 | 100 | ||
101 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason) | 101 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason) |
102 | { | 102 | { |
103 | string tmp = String.Empty; | ||
104 | return CreateAgent(source, destination, aCircuit, flags, ctx, out tmp, out reason); | ||
105 | } | ||
106 | |||
107 | public bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string myipaddress, out string reason) | ||
108 | { | ||
109 | reason = String.Empty; | 103 | reason = String.Empty; |
110 | myipaddress = String.Empty; | ||
111 | 104 | ||
112 | if (destination == null) | 105 | if (destination == null) |
113 | { | 106 | { |
@@ -134,7 +127,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
134 | 127 | ||
135 | reason = data["reason"].AsString(); | 128 | reason = data["reason"].AsString(); |
136 | success = data["success"].AsBoolean(); | 129 | success = data["success"].AsBoolean(); |
137 | myipaddress = data["your_ip"].AsString(); | ||
138 | return success; | 130 | return success; |
139 | } | 131 | } |
140 | 132 | ||
@@ -149,7 +141,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
149 | 141 | ||
150 | reason = data["reason"].AsString(); | 142 | reason = data["reason"].AsString(); |
151 | success = data["success"].AsBoolean(); | 143 | success = data["success"].AsBoolean(); |
152 | myipaddress = data["your_ip"].AsString(); | ||
153 | m_log.WarnFormat( | 144 | m_log.WarnFormat( |
154 | "[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName); | 145 | "[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName); |
155 | return success; | 146 | return success; |