diff options
| author | Melanie | 2009-11-21 16:00:18 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-21 16:00:18 +0000 |
| commit | 0844e5951cac40120aa0e4407b79c0f8b171b0ec (patch) | |
| tree | dbf0d59676a46a32d8c9992421c245b3f27e5af2 /OpenSim/Framework | |
| parent | Merge branch 'careminster' into tests (diff) | |
| parent | * Hack to get avatar to land on prim. This is a big nasty hack that tricks ... (diff) | |
| download | opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.zip opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.gz opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.bz2 opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -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; |