Merge branch 'master' into avinationmerge

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
                             ctx.OutboundVersion = float.Parse(parts[1]);
                         }
                     }
+                    if (data.ContainsKey("variable_wearables_count_supported"))
+                        ctx.VariableWearablesSupported = true;
 
                     m_log.DebugFormat(
                         "[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
         {
             InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
             OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax;
+            VariableWearablesSupported = false;
         }
 
         public float InboundVersion { get; set; }
         public float OutboundVersion { get; set; }
+        public bool VariableWearablesSupported { get; set; }
     }
 
     public interface ISimulationService