aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PrimitiveBaseShape.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-27 17:11:24 -0700
committerJohn Hurliman2010-04-27 17:11:24 -0700
commit59ac792e44fef4de1da9fdf5c3be3ed164cae6cf (patch)
tree5fbea6468c49ae086e19d0d93208f860f54c90d9 /OpenSim/Framework/PrimitiveBaseShape.cs
parentupdate Mono.Data.Sqlite.dll to the one that shipped with Mono 2.6.3, which is... (diff)
downloadopensim-SC_OLD-59ac792e44fef4de1da9fdf5c3be3ed164cae6cf.zip
opensim-SC_OLD-59ac792e44fef4de1da9fdf5c3be3ed164cae6cf.tar.gz
opensim-SC_OLD-59ac792e44fef4de1da9fdf5c3be3ed164cae6cf.tar.bz2
opensim-SC_OLD-59ac792e44fef4de1da9fdf5c3be3ed164cae6cf.tar.xz
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
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(); }