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

add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object

0.7.4.1
dahlia 2012-05-07 00:33:50 -07:00
parent 4186fa10f0
commit 4032455332
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -241,11 +241,15 @@ namespace OpenSim.Framework
m_textureEntry = prim.Textures.GetBytes(); m_textureEntry = prim.Textures.GetBytes();
if (prim.Sculpt != null)
{
SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None); SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
SculptData = prim.Sculpt.GetBytes(); SculptData = prim.Sculpt.GetBytes();
SculptTexture = prim.Sculpt.SculptTexture; SculptTexture = prim.Sculpt.SculptTexture;
SculptType = (byte)prim.Sculpt.Type; SculptType = (byte)prim.Sculpt.Type;
} }
else SculptType = (byte)OpenMetaverse.SculptType.None;
}
[XmlIgnore] [XmlIgnore]
public Primitive.TextureEntry Textures public Primitive.TextureEntry Textures