aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-07-17 18:58:58 +0000
committerSean Dague2008-07-17 18:58:58 +0000
commitdb9e6584bf5747d4f52d38e81d0f7d2eb3b09142 (patch)
treeb34b3486182ed165530aa3f2c6aa80820ae3c8ad
parentgot basic region object saves working time for lunch (diff)
downloadopensim-SC_OLD-db9e6584bf5747d4f52d38e81d0f7d2eb3b09142.zip
opensim-SC_OLD-db9e6584bf5747d4f52d38e81d0f7d2eb3b09142.tar.gz
opensim-SC_OLD-db9e6584bf5747d4f52d38e81d0f7d2eb3b09142.tar.bz2
opensim-SC_OLD-db9e6584bf5747d4f52d38e81d0f7d2eb3b09142.tar.xz
add a null check for safety
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index bdd9858..ffdd40f 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -838,6 +838,9 @@ namespace OpenSim.Framework
838 838
839 public void ReadInExtraParamsBytes(byte[] data) 839 public void ReadInExtraParamsBytes(byte[] data)
840 { 840 {
841 if (data == null)
842 return;
843
841 const ushort FlexiEP = 0x10; 844 const ushort FlexiEP = 0x10;
842 const ushort LightEP = 0x20; 845 const ushort LightEP = 0x20;
843 const ushort SculptEP = 0x30; 846 const ushort SculptEP = 0x30;