Merge branch 'master' into httptests
commit
765f4eef1e
|
@ -381,7 +381,7 @@ namespace OpenSim.Framework
|
|||
default: // 8 faces box with cut
|
||||
shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
|
||||
shape.PathCurve = (byte)Extrusion.Straight;
|
||||
shape.ProfileBegin = 12500;
|
||||
shape.ProfileBegin = 9375;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -5884,7 +5884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f);
|
||||
// fix old values that confused viewers
|
||||
if(profileBegin == 1)
|
||||
profileBegin = 12500;
|
||||
profileBegin = 9375;
|
||||
if(profileHollow == 1)
|
||||
profileHollow = 27500;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue