diff options
| author | Melanie Thielker | 2015-11-01 00:57:45 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2015-11-01 00:57:45 +0100 |
| commit | 5f3b443c034d3d59ae08dce6d560fa8708cb3bd5 (patch) | |
| tree | df8d792995c40bb6af23c97337d64b88256d27a5 | |
| parent | This is the replacement fix for large regions and string version. (diff) | |
| download | opensim-SC_OLD-5f3b443c034d3d59ae08dce6d560fa8708cb3bd5.zip opensim-SC_OLD-5f3b443c034d3d59ae08dce6d560fa8708cb3bd5.tar.gz opensim-SC_OLD-5f3b443c034d3d59ae08dce6d560fa8708cb3bd5.tar.bz2 opensim-SC_OLD-5f3b443c034d3d59ae08dce6d560fa8708cb3bd5.tar.xz | |
Remove an unneeded code path, it could never be reached. Ubit caught it
:)
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 6e87448..5a71951 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -228,18 +228,6 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 228 | // So outbound is what we will accept and inbound is what we will send. Confused yet? | 228 | // So outbound is what we will accept and inbound is what we will send. Confused yet? |
| 229 | outboundVersion = Math.Min(maxVersionProvided, VersionInfo.SimulationServiceVersionAcceptedMax); | 229 | outboundVersion = Math.Min(maxVersionProvided, VersionInfo.SimulationServiceVersionAcceptedMax); |
| 230 | inboundVersion = Math.Min(maxVersionRequired, VersionInfo.SimulationServiceVersionSupportedMax); | 230 | inboundVersion = Math.Min(maxVersionRequired, VersionInfo.SimulationServiceVersionSupportedMax); |
| 231 | |||
| 232 | // Here, the two versions we determined are combined into a single version for legacy response. | ||
| 233 | version = Math.Max(inboundVersion, outboundVersion); | ||
| 234 | |||
| 235 | if (version < VersionInfo.SimulationServiceVersionAcceptedMin || | ||
| 236 | version > VersionInfo.SimulationServiceVersionAcceptedMax || | ||
| 237 | version < VersionInfo.SimulationServiceVersionSupportedMin || | ||
| 238 | version > VersionInfo.SimulationServiceVersionSupportedMax) | ||
| 239 | { | ||
| 240 | // If the single version can't resolve, fall back to safest. This will only affect very old regions. | ||
| 241 | version = 0.1f; | ||
| 242 | } | ||
| 243 | } | 231 | } |
| 244 | 232 | ||
| 245 | List<UUID> features = new List<UUID>(); | 233 | List<UUID> features = new List<UUID>(); |