ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@@ -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;
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
}
}