diff options
| author | Melanie | 2012-05-07 12:07:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-07 12:07:47 +0100 |
| commit | df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2 (patch) | |
| tree | 3e36b8757455c88c3c1f20c14b635e662350aab9 /OpenSim/Framework/PrimitiveBaseShape.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O... (diff) | |
| download | opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.zip opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.gz opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.bz2 opensim-SC-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index c6ccc9e..fcc9873 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -241,10 +241,14 @@ namespace OpenSim.Framework | |||
| 241 | 241 | ||
| 242 | m_textureEntry = prim.Textures.GetBytes(); | 242 | m_textureEntry = prim.Textures.GetBytes(); |
| 243 | 243 | ||
| 244 | SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None); | 244 | if (prim.Sculpt != null) |
| 245 | SculptData = prim.Sculpt.GetBytes(); | 245 | { |
| 246 | SculptTexture = prim.Sculpt.SculptTexture; | 246 | SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None); |
| 247 | SculptType = (byte)prim.Sculpt.Type; | 247 | SculptData = prim.Sculpt.GetBytes(); |
| 248 | SculptTexture = prim.Sculpt.SculptTexture; | ||
| 249 | SculptType = (byte)prim.Sculpt.Type; | ||
| 250 | } | ||
| 251 | else SculptType = (byte)OpenMetaverse.SculptType.None; | ||
| 248 | } | 252 | } |
| 249 | 253 | ||
| 250 | [XmlIgnore] | 254 | [XmlIgnore] |