diff options
| author | Sean Dague | 2008-07-17 18:59:06 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-07-17 18:59:06 +0000 |
| commit | dd144e12ba7a92d4a92986ccaa66d63d410ef028 (patch) | |
| tree | 03aca0f0087568ae975e5c51f3481d3e3fec526d /OpenSim/Framework | |
| parent | finish NHibernate mapping for prims, and it even seems to work (diff) | |
| download | opensim-SC_OLD-dd144e12ba7a92d4a92986ccaa66d63d410ef028.zip opensim-SC_OLD-dd144e12ba7a92d4a92986ccaa66d63d410ef028.tar.gz opensim-SC_OLD-dd144e12ba7a92d4a92986ccaa66d63d410ef028.tar.bz2 opensim-SC_OLD-dd144e12ba7a92d4a92986ccaa66d63d410ef028.tar.xz | |
git merge
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 5657b66..bdd9858 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -197,13 +197,7 @@ namespace OpenSim.Framework | |||
| 197 | { | 197 | { |
| 198 | get { return m_textureEntry; } | 198 | get { return m_textureEntry; } |
| 199 | 199 | ||
| 200 | set | 200 | set { m_textureEntry = value; } |
| 201 | { | ||
| 202 | if (value == null) | ||
| 203 | m_textureEntry = new byte[1]; | ||
| 204 | else | ||
| 205 | m_textureEntry = value; | ||
| 206 | } | ||
| 207 | } | 201 | } |
| 208 | 202 | ||
| 209 | 203 | ||
| @@ -844,9 +838,6 @@ namespace OpenSim.Framework | |||
| 844 | 838 | ||
| 845 | public void ReadInExtraParamsBytes(byte[] data) | 839 | public void ReadInExtraParamsBytes(byte[] data) |
| 846 | { | 840 | { |
| 847 | if (data == null) | ||
| 848 | return; | ||
| 849 | |||
| 850 | const ushort FlexiEP = 0x10; | 841 | const ushort FlexiEP = 0x10; |
| 851 | const ushort LightEP = 0x20; | 842 | const ushort LightEP = 0x20; |
| 852 | const ushort SculptEP = 0x30; | 843 | const ushort SculptEP = 0x30; |