From fd4e703f25328cafdc21fd9a089a699b1c4f54ca Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 25 Jul 2008 15:18:24 +0000 Subject: * Remove dumb bug I put in which meant that an archive save would never complete if there were any missing assets --- OpenSim/Framework/PrimitiveBaseShape.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 5657b66..ef74b54 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs @@ -169,9 +169,6 @@ namespace OpenSim.Framework } } - - - static PrimitiveBaseShape() { m_defaultTexture = @@ -188,7 +185,11 @@ namespace OpenSim.Framework [XmlIgnore] public LLObject.TextureEntry Textures { - get { return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); } + get + { + //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); + return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); + } set { m_textureEntry = value.ToBytes(); } } @@ -206,8 +207,6 @@ namespace OpenSim.Framework } } - - public static PrimitiveBaseShape Default { get -- cgit v1.1