aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2009-11-17 23:17:50 -0800
committerdahlia2009-11-17 23:17:50 -0800
commit1afd3476158d1821cf9d8441926b489cb5b4d217 (patch)
tree56fc4f949e4e183f71e1392c56b4de81891a00a3
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-1afd3476158d1821cf9d8441926b489cb5b4d217.zip
opensim-SC_OLD-1afd3476158d1821cf9d8441926b489cb5b4d217.tar.gz
opensim-SC_OLD-1afd3476158d1821cf9d8441926b489cb5b4d217.tar.bz2
opensim-SC_OLD-1afd3476158d1821cf9d8441926b489cb5b4d217.tar.xz
Correct formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive method
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
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";