diff options
| author | UbitUmarov | 2015-11-01 04:12:17 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-01 04:12:17 +0000 |
| commit | 29798cefcc8d79f7495473c7ca275b58596fdc3d (patch) | |
| tree | be06ebc140aa8133a4cf947afb580af401d05bcc /OpenSim/Services/Interfaces | |
| parent | fix more merge issues (diff) | |
| parent | Plumb the special VeriableWearablesSuported field which we will (diff) | |
| download | opensim-SC_OLD-29798cefcc8d79f7495473c7ca275b58596fdc3d.zip opensim-SC_OLD-29798cefcc8d79f7495473c7ca275b58596fdc3d.tar.gz opensim-SC_OLD-29798cefcc8d79f7495473c7ca275b58596fdc3d.tar.bz2 opensim-SC_OLD-29798cefcc8d79f7495473c7ca275b58596fdc3d.tar.xz | |
Merge branch 'master' into avinationmerge
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/ISimulationService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index 257b578..3f6b009 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
| @@ -40,10 +40,12 @@ namespace OpenSim.Services.Interfaces | |||
| 40 | { | 40 | { |
| 41 | InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax; | 41 | InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax; |
| 42 | OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax; | 42 | OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax; |
| 43 | VariableWearablesSupported = false; | ||
| 43 | } | 44 | } |
| 44 | 45 | ||
| 45 | public float InboundVersion { get; set; } | 46 | public float InboundVersion { get; set; } |
| 46 | public float OutboundVersion { get; set; } | 47 | public float OutboundVersion { get; set; } |
| 48 | public bool VariableWearablesSupported { get; set; } | ||
| 47 | } | 49 | } |
| 48 | 50 | ||
| 49 | public interface ISimulationService | 51 | public interface ISimulationService |