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

Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7 

We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
iar_mods
Justin Clark-Casey (justincc) 2011-12-03 15:54:06 +00:00
parent e75bcd4c59
commit aba42d8543
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -3273,16 +3273,13 @@ namespace OpenSim.Region.Framework.Scenes
break; break;
case PrimType.SCULPT: case PrimType.SCULPT:
// Special mesh handling // Special mesh handling
if (this.Shape.SculptType == 5) if (Shape.SculptType == (byte)SculptType.Mesh)
{ ret = 8; // if it's a mesh then max 8 faces
ret = 7; // its a mesh then max 8 faces
}
else else
{ ret = 1; // if it's a sculpt then max 1 face
ret = 1; // its a sculpt then max 1 faces
}
break; break;
} }
return ret; return ret;
} }
@ -3295,6 +3292,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (Shape.SculptEntry) if (Shape.SculptEntry)
return PrimType.SCULPT; return PrimType.SCULPT;
if ((Shape.ProfileCurve & 0x07) == (byte)ProfileShape.Square) if ((Shape.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
{ {
if (Shape.PathCurve == (byte)Extrusion.Straight) if (Shape.PathCurve == (byte)Extrusion.Straight)