aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorSean Dague2008-07-17 18:59:10 +0000
committerSean Dague2008-07-17 18:59:10 +0000
commit6084a7ea3eb8fff88d57ca911b9b922a2f09ccf7 (patch)
tree048f753c7be960551f49c3f489b66b20371951b6 /OpenSim/Framework
parentgit merge (diff)
downloadopensim-SC_OLD-6084a7ea3eb8fff88d57ca911b9b922a2f09ccf7.zip
opensim-SC_OLD-6084a7ea3eb8fff88d57ca911b9b922a2f09ccf7.tar.gz
opensim-SC_OLD-6084a7ea3eb8fff88d57ca911b9b922a2f09ccf7.tar.bz2
opensim-SC_OLD-6084a7ea3eb8fff88d57ca911b9b922a2f09ccf7.tar.xz
Revert "git merge"
This reverts commit 80e1c3742a3ba7eb9aa1686a242b36f64331095a.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index bdd9858..5657b66 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -197,7 +197,13 @@ namespace OpenSim.Framework
197 { 197 {
198 get { return m_textureEntry; } 198 get { return m_textureEntry; }
199 199
200 set { m_textureEntry = value; } 200 set
201 {
202 if (value == null)
203 m_textureEntry = new byte[1];
204 else
205 m_textureEntry = value;
206 }
201 } 207 }
202 208
203 209
@@ -838,6 +844,9 @@ namespace OpenSim.Framework
838 844
839 public void ReadInExtraParamsBytes(byte[] data) 845 public void ReadInExtraParamsBytes(byte[] data)
840 { 846 {
847 if (data == null)
848 return;
849
841 const ushort FlexiEP = 0x10; 850 const ushort FlexiEP = 0x10;
842 const ushort LightEP = 0x20; 851 const ushort LightEP = 0x20;
843 const ushort SculptEP = 0x30; 852 const ushort SculptEP = 0x30;