diff options
| author | Melanie | 2009-11-18 06:20:21 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-18 06:20:21 +0000 |
| commit | 5d0778014df68b48abb08c8f63204cf7e077af7f (patch) | |
| tree | 5f6ef28958950412130f68fa3bbe1491a456eef7 /OpenSim/Framework/PrimitiveBaseShape.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change PresenceData to PresenceInfo to remove a naming conflict in the (diff) | |
| download | opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.zip opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.gz opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.bz2 opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 97231ff..e43d634 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -1153,7 +1153,7 @@ namespace OpenSim.Framework | |||
| 1153 | prim.Light.Radius = this.LightRadius; | 1153 | prim.Light.Radius = this.LightRadius; |
| 1154 | } | 1154 | } |
| 1155 | 1155 | ||
| 1156 | prim.Textures = new Primitive.TextureEntry(this.TextureEntry, 0, this.TextureEntry.Length); | 1156 | prim.Textures = this.Textures; |
| 1157 | 1157 | ||
| 1158 | prim.Properties = new Primitive.ObjectProperties(); | 1158 | prim.Properties = new Primitive.ObjectProperties(); |
| 1159 | prim.Properties.Name = "Primitive"; | 1159 | prim.Properties.Name = "Primitive"; |