OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2017-09-16 19:01:22 +01:00
parent 5687c5d494 2247251c2f
commit 765f4eef1e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -381,7 +381,7 @@ namespace OpenSim.Framework
default: // 8 faces box with cut default: // 8 faces box with cut
shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle; shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
shape.PathCurve = (byte)Extrusion.Straight; shape.PathCurve = (byte)Extrusion.Straight;
shape.ProfileBegin = 12500; shape.ProfileBegin = 9375;
break; break;
} }

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5884,7 +5884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f); update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f);
// fix old values that confused viewers // fix old values that confused viewers
if(profileBegin == 1) if(profileBegin == 1)
profileBegin = 12500; profileBegin = 9375;
if(profileHollow == 1) if(profileHollow == 1)
profileHollow = 27500; profileHollow = 27500;
} }