1 files changed, 20 insertions, 0 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index e258bcb..54542c9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -155,8 +155,13 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_features["MeshRezEnabled"] = true;
                 m_features["MeshUploadEnabled"] = true;
                 m_features["MeshXferEnabled"] = true;
+
                 m_features["PhysicsMaterialsEnabled"] = true;
+<<<<<<< HEAD
 
+=======
+   
+>>>>>>> avn/ubitvar
                 OSDMap typesMap = new OSDMap();
                 typesMap["convex"] = true;
                 typesMap["none"] = true;
@@ -164,6 +169,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_features["PhysicsShapeTypes"] = typesMap;
 
                 // Extra information for viewers that want to use it
+<<<<<<< HEAD
                 // TODO: Take these out of here into their respective modules, like map-server-url
                 OSDMap extrasMap;
                 if(m_features.ContainsKey("OpenSimExtras"))
@@ -173,6 +179,15 @@ namespace OpenSim.Region.ClientStack.Linden
                 else
                     extrasMap = new OSDMap();
 
+=======
+                
+                OSDMap extrasMap = new OSDMap();
+
+                extrasMap["AvatarSkeleton"] = true;
+                extrasMap["AnimationSet"] = true;
+
+                // TODO: Take these out of here into their respective modules, like map-server-url
+>>>>>>> avn/ubitvar
                 if (m_SearchURL != string.Empty)
                     extrasMap["search-server-url"] = m_SearchURL;
                 if (!string.IsNullOrEmpty(m_DestinationGuideURL))
@@ -184,8 +199,13 @@ namespace OpenSim.Region.ClientStack.Linden
                 if (m_GridName != string.Empty)
                     extrasMap["GridName"] = m_GridName;
 
+<<<<<<< HEAD
                 if (extrasMap.Count > 0)
                     m_features["OpenSimExtras"] = extrasMap;
+=======
+                m_features["OpenSimExtras"] = extrasMap;
+
+>>>>>>> avn/ubitvar
             }
         }