Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
author: Melanie 2013-05-30 21:48:09 +0100
committer: Melanie 2013-05-30 21:48:09 +0100
commit: 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree: 6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
parent: Merge branch 'master' into careminster (diff)
parent: Try caching the user name for a new agent earlier on in the process of establ... (diff)
download: opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index e98a7fb..2651e3b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -375,7 +375,7 @@ public static class BSParam
        new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
            false ),
        new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",
-            false ),
+            true ),
        new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
            5 ),
author	Melanie	2013-05-30 21:48:09 +0100
committer	Melanie	2013-05-30 21:48:09 +0100
commit	669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree	6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
parent	Merge branch 'master' into careminster (diff)
parent	Try caching the user name for a new agent earlier on in the process of establ... (diff)
download	opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index e98a7fb..2651e3b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -375,7 +375,7 @@ public static class BSParam
375	new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",	375	new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
376	false ),	376	false ),
377	new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",	377	new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",
378	false ),	378	true ),
379		379
380	new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",	380	new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
381	5 ),	381	5 ),