aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authordahlia2012-05-07 00:33:50 -0700
committerdahlia2012-05-07 00:33:50 -0700
commit40324553322d1cf211eec32041bad5a2dc197f6d (patch)
tree97272025548e2842ef478e8c033fc934c80ad8a6 /OpenSim/Framework
parentremove default values from prior commit since mono cant deal with them (diff)
downloadopensim-SC_OLD-40324553322d1cf211eec32041bad5a2dc197f6d.zip
opensim-SC_OLD-40324553322d1cf211eec32041bad5a2dc197f6d.tar.gz
opensim-SC_OLD-40324553322d1cf211eec32041bad5a2dc197f6d.tar.bz2
opensim-SC_OLD-40324553322d1cf211eec32041bad5a2dc197f6d.tar.xz
add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 1b6a1d2..76dcfca 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]