aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-25 15:18:24 +0000
committerJustin Clarke Casey2008-07-25 15:18:24 +0000
commitfd4e703f25328cafdc21fd9a089a699b1c4f54ca (patch)
tree79ac36ecef9dc57e1183c0a7c036ad3ec3955e86 /OpenSim/Framework
parentsquasing warning. (diff)
downloadopensim-SC-fd4e703f25328cafdc21fd9a089a699b1c4f54ca.zip
opensim-SC-fd4e703f25328cafdc21fd9a089a699b1c4f54ca.tar.gz
opensim-SC-fd4e703f25328cafdc21fd9a089a699b1c4f54ca.tar.bz2
opensim-SC-fd4e703f25328cafdc21fd9a089a699b1c4f54ca.tar.xz
* Remove dumb bug I put in which meant that an archive save would never complete if there were any missing assets
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs11
1 files changed, 5 insertions, 6 deletions
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
169 } 169 }
170 } 170 }
171 171
172
173
174
175 static PrimitiveBaseShape() 172 static PrimitiveBaseShape()
176 { 173 {
177 m_defaultTexture = 174 m_defaultTexture =
@@ -188,7 +185,11 @@ namespace OpenSim.Framework
188 [XmlIgnore] 185 [XmlIgnore]
189 public LLObject.TextureEntry Textures 186 public LLObject.TextureEntry Textures
190 { 187 {
191 get { return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); } 188 get
189 {
190 //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
191 return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
192 }
192 193
193 set { m_textureEntry = value.ToBytes(); } 194 set { m_textureEntry = value.ToBytes(); }
194 } 195 }
@@ -206,8 +207,6 @@ namespace OpenSim.Framework
206 } 207 }
207 } 208 }
208 209
209
210
211 public static PrimitiveBaseShape Default 210 public static PrimitiveBaseShape Default
212 { 211 {
213 get 212 get