ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-04-29 23:33:26 +01:00
parent f06772a088 6a4fae123a
commit 08ebcdb0b8
18 changed files with 884 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -236,7 +236,7 @@ namespace OpenSim.Framework
catch { }
m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0));
return new Primitive.TextureEntry(null);
return new Primitive.TextureEntry(UUID.Zero);
}
set { m_textureEntry = value.GetBytes(); }