aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordahlia2009-11-20 03:12:07 -0800
committerdahlia2009-11-20 03:12:07 -0800
commit54b5677f23e6f65e7da8ad8c54a086d7d11f8f55 (patch)
treec7fc4218197e6f68a93592cff372e2fb13940b8a /OpenSim
parentCorrect formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive... (diff)
downloadopensim-SC-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.zip
opensim-SC-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.tar.gz
opensim-SC-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.tar.bz2
opensim-SC-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.tar.xz
remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a sculpty
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index e43d634..fe8f020 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1099,8 +1099,6 @@ namespace OpenSim.Framework
1099 prim.Sculpt = new Primitive.SculptData(); 1099 prim.Sculpt = new Primitive.SculptData();
1100 prim.Sculpt.Type = (OpenMetaverse.SculptType)this.SculptType; 1100 prim.Sculpt.Type = (OpenMetaverse.SculptType)this.SculptType;
1101 prim.Sculpt.SculptTexture = this.SculptTexture; 1101 prim.Sculpt.SculptTexture = this.SculptTexture;
1102
1103 return prim;
1104 } 1102 }
1105 1103
1106 prim.PrimData.PathShearX = this.PathShearX < 128 ? (float)this.PathShearX * 0.01f : (float)(this.PathShearX - 256) * 0.01f; 1104 prim.PrimData.PathShearX = this.PathShearX < 128 ? (float)this.PathShearX * 0.01f : (float)(this.PathShearX - 256) * 0.01f;