Merge branch 'master' into httptests
commit
4a982adb02
|
@ -3930,25 +3930,25 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
break;
|
break;
|
||||||
case PrimType.SPHERE:
|
case PrimType.SPHERE:
|
||||||
ret = 1;
|
ret = 1;
|
||||||
if (hasCut) ret += 2;
|
if (hasCut || Shape.PathSkew != 0) ret += 2;
|
||||||
if (hasDimple) ret += 2;
|
if (hasDimple) ret += 2;
|
||||||
if (hasHollow) ret += 1;
|
if (hasHollow) ret += 1;
|
||||||
break;
|
break;
|
||||||
case PrimType.TORUS:
|
case PrimType.TORUS:
|
||||||
ret = 1;
|
ret = 1;
|
||||||
if (hasCut) ret += 2;
|
if (hasCut || Shape.PathSkew != 0) ret += 2;
|
||||||
if (hasProfileCut) ret += 2;
|
if (hasProfileCut) ret += 2;
|
||||||
if (hasHollow) ret += 1;
|
if (hasHollow) ret += 1;
|
||||||
break;
|
break;
|
||||||
case PrimType.TUBE:
|
case PrimType.TUBE:
|
||||||
ret = 4;
|
ret = 4;
|
||||||
if (hasCut) ret += 2;
|
if (hasCut || Shape.PathSkew != 0) ret += 2;
|
||||||
if (hasProfileCut) ret += 2;
|
if (hasProfileCut) ret += 2;
|
||||||
if (hasHollow) ret += 1;
|
if (hasHollow) ret += 1;
|
||||||
break;
|
break;
|
||||||
case PrimType.RING:
|
case PrimType.RING:
|
||||||
ret = 3;
|
ret = 3;
|
||||||
if (hasCut) ret += 2;
|
if (hasCut || Shape.PathSkew != 0) ret += 2;
|
||||||
if (hasProfileCut) ret += 2;
|
if (hasProfileCut) ret += 2;
|
||||||
if (hasHollow) ret += 1;
|
if (hasHollow) ret += 1;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue