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

Merge branch 'master' into avinationmerge

avinationmerge
UbitUmarov 2015-11-01 04:12:17 +00:00
parent 54e1d54fb5 6510ba8a64
commit 29798cefcc
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,6 +346,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"))
ctx.VariableWearablesSupported = true;
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}",

2
OpenSim/Services/Interfaces/ISimulationService.cs
View File

@ -40,10 +40,12 @@ namespace OpenSim.Services.Interfaces
{ {
InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax; InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax; OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax;
VariableWearablesSupported = false;
} }
public float InboundVersion { get; set; } public float InboundVersion { get; set; }
public float OutboundVersion { get; set; } public float OutboundVersion { get; set; }
public bool VariableWearablesSupported { get; set; }
} }
public interface ISimulationService public interface ISimulationService