aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 948c259..df928dc 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -622,6 +622,8 @@ namespace OpenSim.Framework
622 } 622 }
623 } 623 }
624 624
625 // This is only used at runtime. For sculpties this holds the texture data, and for meshes
626 // the mesh data.
625 public byte[] SculptData 627 public byte[] SculptData
626 { 628 {
627 get 629 get
@@ -1175,14 +1177,13 @@ namespace OpenSim.Framework
1175 1177
1176 public void ReadSculptData(byte[] data, int pos) 1178 public void ReadSculptData(byte[] data, int pos)
1177 { 1179 {
1178 byte[] SculptTextureUUID = new byte[16]; 1180 UUID SculptUUID;
1179 UUID SculptUUID = UUID.Zero; 1181 byte SculptTypel;
1180 byte SculptTypel = data[16+pos];
1181 1182
1182 if (data.Length+pos >= 17) 1183 if (data.Length-pos >= 17)
1183 { 1184 {
1184 _sculptEntry = true; 1185 _sculptEntry = true;
1185 SculptTextureUUID = new byte[16]; 1186 byte[] SculptTextureUUID = new byte[16];
1186 SculptTypel = data[16 + pos]; 1187 SculptTypel = data[16 + pos];
1187 Array.Copy(data, pos, SculptTextureUUID,0, 16); 1188 Array.Copy(data, pos, SculptTextureUUID,0, 16);
1188 SculptUUID = new UUID(SculptTextureUUID, 0); 1189 SculptUUID = new UUID(SculptTextureUUID, 0);