diff options
| author | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
| commit | 89e79c11335d55ae8131d6fa92218bf387e6c48e (patch) | |
| tree | bb96e1093123b21e41f52e61000398f82f83f23b /OpenSim/Framework/PrimitiveBaseShape.cs | |
| parent | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy (diff) | |
| parent | Fix some symbol errors (diff) | |
| download | opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.zip opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.gz opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.bz2 opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 1208b97..4d1de22 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -236,7 +236,7 @@ namespace OpenSim.Framework | |||
| 236 | catch { } | 236 | catch { } |
| 237 | 237 | ||
| 238 | m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0)); | 238 | m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0)); |
| 239 | return new Primitive.TextureEntry(null); | 239 | return new Primitive.TextureEntry(UUID.Zero); |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | set { m_textureEntry = value.GetBytes(); } | 242 | set { m_textureEntry = value.GetBytes(); } |