aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-11-01 04:12:17 +0000
committerUbitUmarov2015-11-01 04:12:17 +0000
commit29798cefcc8d79f7495473c7ca275b58596fdc3d (patch)
treebe06ebc140aa8133a4cf947afb580af401d05bcc /OpenSim
parent fix more merge issues (diff)
parentPlumb the special VeriableWearablesSuported field which we will (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs2
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs2
2 files changed, 4 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}",
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