diff options
| author | dahlia | 2009-11-20 03:12:07 -0800 |
|---|---|---|
| committer | dahlia | 2009-11-20 03:12:07 -0800 |
| commit | 54b5677f23e6f65e7da8ad8c54a086d7d11f8f55 (patch) | |
| tree | c7fc4218197e6f68a93592cff372e2fb13940b8a /OpenSim/Framework | |
| parent | Correct formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive... (diff) | |
| download | opensim-SC_OLD-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.zip opensim-SC_OLD-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.tar.gz opensim-SC_OLD-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.tar.bz2 opensim-SC_OLD-54b5677f23e6f65e7da8ad8c54a086d7d11f8f55.tar.xz | |
remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a sculpty
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
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; |