From 8c75625e85d1cfd3e91d6dc7697dd9553ac7a4d7 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 30 Nov 2015 01:50:56 +0000 Subject: [PATCH] downgrade protocol max to 0.3 since variable wearable types is still not supported --- OpenSim/Framework/VersionInfo.cs | 4 ++-- OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 2 +- .../Connectors/Simulation/SimulationServiceConnector.cs | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index 5335dc1235..51fbcdc9a8 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs @@ -83,8 +83,8 @@ namespace OpenSim /// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. /// public readonly static float SimulationServiceVersionAcceptedMin = 0.3f; - public readonly static float SimulationServiceVersionAcceptedMax = 0.4f; + public readonly static float SimulationServiceVersionAcceptedMax = 0.3f; public readonly static float SimulationServiceVersionSupportedMin = 0.3f; - public readonly static float SimulationServiceVersionSupportedMax = 0.4f; + public readonly static float SimulationServiceVersionSupportedMax = 0.3f; } } diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 98c5312062..5c5b45e9b3 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs @@ -262,7 +262,7 @@ namespace OpenSim.Server.Handlers.Simulation resp["version"] = OSD.FromString(legacyVersion); resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion); resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion); - resp["variable_wearables_count_supported"] = OSD.FromBoolean(true); + resp["variable_wearables_count_supported"] = OSD.FromBoolean(false); OSDArray featuresWanted = new OSDArray(); foreach (UUID feature in features) diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index cea870b361..69e1d9e6a4 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs @@ -345,8 +345,9 @@ namespace OpenSim.Services.Connectors.Simulation ctx.OutboundVersion = float.Parse(parts[1]); } } - if (data.ContainsKey("variable_wearables_count_supported")) - ctx.VariableWearablesSupported = true; +// if (data.ContainsKey("variable_wearables_count_supported")) +// ctx.VariableWearablesSupported = true; + ctx.VariableWearablesSupported = false; m_log.DebugFormat( "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}",