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

Revert "downgrade protocol max to 0.3 since variable wearable types is still not supported" 

This reverts commit 8c75625e85.
0.8.2-post-fixes
Melanie Thielker 2015-12-01 15:55:42 +01:00
parent 13bdd25cfd
commit 22cf03ea0b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/VersionInfo.cs
View File

@ -83,8 +83,8 @@ namespace OpenSim
/// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. /// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
/// </remarks> /// </remarks>
public readonly static float SimulationServiceVersionAcceptedMin = 0.3f; public readonly static float SimulationServiceVersionAcceptedMin = 0.3f;
public readonly static float SimulationServiceVersionAcceptedMax = 0.3f; public readonly static float SimulationServiceVersionAcceptedMax = 0.4f;
public readonly static float SimulationServiceVersionSupportedMin = 0.3f; public readonly static float SimulationServiceVersionSupportedMin = 0.3f;
public readonly static float SimulationServiceVersionSupportedMax = 0.3f; public readonly static float SimulationServiceVersionSupportedMax = 0.4f;
} }
} }

2
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -262,7 +262,7 @@ namespace OpenSim.Server.Handlers.Simulation
resp["version"] = OSD.FromString(legacyVersion); resp["version"] = OSD.FromString(legacyVersion);
resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion); resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion);
resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion); resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion);
resp["variable_wearables_count_supported"] = OSD.FromBoolean(false); resp["variable_wearables_count_supported"] = OSD.FromBoolean(true);
OSDArray featuresWanted = new OSDArray(); OSDArray featuresWanted = new OSDArray();
foreach (UUID feature in features) foreach (UUID feature in features)

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

@ -345,9 +345,8 @@ namespace OpenSim.Services.Connectors.Simulation
ctx.OutboundVersion = float.Parse(parts[1]); ctx.OutboundVersion = float.Parse(parts[1]);
} }
} }
// if (data.ContainsKey("variable_wearables_count_supported")) if (data.ContainsKey("variable_wearables_count_supported"))
// ctx.VariableWearablesSupported = true; ctx.VariableWearablesSupported = true;
ctx.VariableWearablesSupported = false;
m_log.DebugFormat( m_log.DebugFormat(
"[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}", "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}",