Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

author: ubit 2012-07-28 02:03:18 +0200
committer: ubit 2012-07-28 02:03:18 +0200
commit: 7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4 (patch)
tree: 794b0e167577ce2724acaba41671c378b6308924 /OpenSim/Region/Physics
parent: Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent: Implement the linefeed URL hack for ShoutCast and other services (diff)
download: opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.zip
opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.tar.gz
opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.tar.bz2
opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index a554897..f3ac3ca 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1027,7 +1027,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                                    {
                                        d.AABB aabb;
                                        d.GeomGetAABB(g2, out aabb);
-                                        float tmp = vtmp.Z - sz * .25f;
+                                        float tmp = vtmp.Z - sz * .18f;
                                        if (aabb.MaxZ < tmp)
                                        {
@@ -1057,7 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                                    {
                                        d.AABB aabb;
                                        d.GeomGetAABB(g1, out aabb);
-                                        float tmp = vtmp.Z - sz * .25f;
+                                        float tmp = vtmp.Z - sz * .18f;
                                        if (aabb.MaxZ < tmp)
                                        {
author	ubit	2012-07-28 02:03:18 +0200
committer	ubit	2012-07-28 02:03:18 +0200
commit	7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4 (patch)
tree	794b0e167577ce2724acaba41671c378b6308924 /OpenSim/Region/Physics
parent	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent	Implement the linefeed URL hack for ShoutCast and other services (diff)
download	opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.zip opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.tar.gz opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.tar.bz2 opensim-SC-7f5ac795beafbd0cab3f0614b8a6a6c883fa4fb4.tar.xz

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index a554897..f3ac3ca 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1027,7 +1027,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1027	{	1027	{
1028	d.AABB aabb;	1028	d.AABB aabb;
1029	d.GeomGetAABB(g2, out aabb);	1029	d.GeomGetAABB(g2, out aabb);
1030	float tmp = vtmp.Z - sz * .25f;	1030	float tmp = vtmp.Z - sz * .18f;
1031		1031
1032	if (aabb.MaxZ < tmp)	1032	if (aabb.MaxZ < tmp)
1033	{	1033	{
@@ -1057,7 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1057	{	1057	{
1058	d.AABB aabb;	1058	d.AABB aabb;
1059	d.GeomGetAABB(g1, out aabb);	1059	d.GeomGetAABB(g1, out aabb);
1060	float tmp = vtmp.Z - sz * .25f;	1060	float tmp = vtmp.Z - sz * .18f;
1061		1061
1062	if (aabb.MaxZ < tmp)	1062	if (aabb.MaxZ < tmp)
1063	{	1063	{