diff options
| author | Melanie | 2010-04-29 23:33:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-29 23:33:26 +0100 |
| commit | 08ebcdb0b8122b687fb27d21076d0d01941ed8e2 (patch) | |
| tree | 311775c3fc4db3ccb3f6b12376a69b0d08aede89 /OpenSim/Framework | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Started redoing HGInventoryBroker for XInventory and with multi-protocol in m... (diff) | |
| download | opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.zip opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.gz opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.bz2 opensim-SC-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -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(); } |