From 9a3df6445e82453964e0604b91ad08499406a2e2 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 12 Oct 2014 12:52:12 +0100 Subject: [PATCH] move AnimationSet and AvatarSkeleton to OpenSimExtras --- .../Linden/Caps/SimulatorFeaturesModule.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index 7c22a7ca63..bedec80ae8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs @@ -131,8 +131,6 @@ namespace OpenSim.Region.ClientStack.Linden m_features["MeshRezEnabled"] = true; m_features["MeshUploadEnabled"] = true; m_features["MeshXferEnabled"] = true; - m_features["AvatarSkeleton"] = true; - m_features["AnimationSet"] = true; m_features["PhysicsMaterialsEnabled"] = true; @@ -143,15 +141,19 @@ namespace OpenSim.Region.ClientStack.Linden m_features["PhysicsShapeTypes"] = typesMap; // Extra information for viewers that want to use it - // TODO: Take these out of here into their respective modules, like map-server-url + OSDMap extrasMap = new OSDMap(); + + extrasMap["AvatarSkeleton"] = true; + extrasMap["AnimationSet"] = true; + + // TODO: Take these out of here into their respective modules, like map-server-url if (m_SearchURL != string.Empty) extrasMap["search-server-url"] = m_SearchURL; if (m_ExportSupported) extrasMap["ExportSupported"] = true; - if (extrasMap.Count > 0) - m_features["OpenSimExtras"] = extrasMap; + m_features["OpenSimExtras"] = extrasMap; } }