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/Connectors/Simulation/SimulationServiceConnector.cs | |
| 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/Connectors/Simulation/SimulationServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index ebffa28..3bf03cf 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
| @@ -346,6 +346,8 @@ namespace OpenSim.Services.Connectors.Simulation | |||
| 346 | ctx.OutboundVersion = float.Parse(parts[1]); | 346 | ctx.OutboundVersion = float.Parse(parts[1]); |
| 347 | } | 347 | } |
| 348 | } | 348 | } |
| 349 | if (data.ContainsKey("variable_wearables_count_supported")) | ||
| 350 | ctx.VariableWearablesSupported = true; | ||
| 349 | 351 | ||
| 350 | m_log.DebugFormat( | 352 | m_log.DebugFormat( |
| 351 | "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}", | 353 | "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}", |