diff options
author | Melanie Thielker | 2014-10-12 00:08:06 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-10-12 00:08:06 +0200 |
commit | e0d5cefc69b3660bf5d6c9594c0d9f67036899d6 (patch) | |
tree | 89f9b4c0b8f26fa070bab04252c53949f3174268 /OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |
parent | Merge branch 'ubitworkmaster' (diff) | |
parent | add simulator features AvatarSkeleton and AnimationSet report (diff) | |
download | opensim-SC_OLD-e0d5cefc69b3660bf5d6c9594c0d9f67036899d6.zip opensim-SC_OLD-e0d5cefc69b3660bf5d6c9594c0d9f67036899d6.tar.gz opensim-SC_OLD-e0d5cefc69b3660bf5d6c9594c0d9f67036899d6.tar.bz2 opensim-SC_OLD-e0d5cefc69b3660bf5d6c9594c0d9f67036899d6.tar.xz |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index e4d8a20..7c22a7c 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |||
@@ -131,8 +131,11 @@ namespace OpenSim.Region.ClientStack.Linden | |||
131 | m_features["MeshRezEnabled"] = true; | 131 | m_features["MeshRezEnabled"] = true; |
132 | m_features["MeshUploadEnabled"] = true; | 132 | m_features["MeshUploadEnabled"] = true; |
133 | m_features["MeshXferEnabled"] = true; | 133 | m_features["MeshXferEnabled"] = true; |
134 | m_features["AvatarSkeleton"] = true; | ||
135 | m_features["AnimationSet"] = true; | ||
136 | |||
134 | m_features["PhysicsMaterialsEnabled"] = true; | 137 | m_features["PhysicsMaterialsEnabled"] = true; |
135 | 138 | ||
136 | OSDMap typesMap = new OSDMap(); | 139 | OSDMap typesMap = new OSDMap(); |
137 | typesMap["convex"] = true; | 140 | typesMap["convex"] = true; |
138 | typesMap["none"] = true; | 141 | typesMap["none"] = true; |