diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index a5f3ba6..a49f53c 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -1039,6 +1039,7 @@ namespace OpenSim.Framework | |||
1039 | const byte LightEP = 0x20; | 1039 | const byte LightEP = 0x20; |
1040 | const byte SculptEP = 0x30; | 1040 | const byte SculptEP = 0x30; |
1041 | const byte ProjectionEP = 0x40; | 1041 | const byte ProjectionEP = 0x40; |
1042 | //const byte MeshEP = 0x60; | ||
1042 | const byte MeshFlagsEP = 0x70; | 1043 | const byte MeshFlagsEP = 0x70; |
1043 | 1044 | ||
1044 | int TotalBytesLength = 1; // ExtraParamsNum | 1045 | int TotalBytesLength = 1; // ExtraParamsNum |
@@ -1121,7 +1122,10 @@ namespace OpenSim.Framework | |||
1121 | 1122 | ||
1122 | if (_sculptEntry) | 1123 | if (_sculptEntry) |
1123 | { | 1124 | { |
1124 | returnBytes[i] = SculptEP; | 1125 | //if(_sculptType == 5) |
1126 | // returnBytes[i] = MeshEP; | ||
1127 | //else | ||
1128 | returnBytes[i] = SculptEP; | ||
1125 | i += 2; | 1129 | i += 2; |
1126 | returnBytes[i] = 17; | 1130 | returnBytes[i] = 17; |
1127 | i += 4; | 1131 | i += 4; |
@@ -1164,6 +1168,7 @@ namespace OpenSim.Framework | |||
1164 | const ushort LightEP = 0x20; | 1168 | const ushort LightEP = 0x20; |
1165 | const ushort SculptEP = 0x30; | 1169 | const ushort SculptEP = 0x30; |
1166 | const ushort ProjectionEP = 0x40; | 1170 | const ushort ProjectionEP = 0x40; |
1171 | const ushort MeshEP = 0x60; | ||
1167 | const ushort MeshFlagsEP = 0x70; | 1172 | const ushort MeshFlagsEP = 0x70; |
1168 | 1173 | ||
1169 | switch (type) | 1174 | switch (type) |
@@ -1186,6 +1191,7 @@ namespace OpenSim.Framework | |||
1186 | ReadLightData(data, 0); | 1191 | ReadLightData(data, 0); |
1187 | break; | 1192 | break; |
1188 | 1193 | ||
1194 | case MeshEP: | ||
1189 | case SculptEP: | 1195 | case SculptEP: |
1190 | if (!inUse) | 1196 | if (!inUse) |
1191 | { | 1197 | { |
@@ -1231,6 +1237,7 @@ namespace OpenSim.Framework | |||
1231 | const byte LightEP = 0x20; | 1237 | const byte LightEP = 0x20; |
1232 | const byte SculptEP = 0x30; | 1238 | const byte SculptEP = 0x30; |
1233 | const byte ProjectionEP = 0x40; | 1239 | const byte ProjectionEP = 0x40; |
1240 | const byte MeshEP = 0x60; | ||
1234 | const byte MeshFlagsEP = 0x70; | 1241 | const byte MeshFlagsEP = 0x70; |
1235 | 1242 | ||
1236 | byte extraParamCount = data[0]; | 1243 | byte extraParamCount = data[0]; |
@@ -1252,6 +1259,7 @@ namespace OpenSim.Framework | |||
1252 | i += 16; | 1259 | i += 16; |
1253 | break; | 1260 | break; |
1254 | 1261 | ||
1262 | case MeshEP: | ||
1255 | case SculptEP: | 1263 | case SculptEP: |
1256 | ReadSculptData(data, i); | 1264 | ReadSculptData(data, i); |
1257 | i += 17; | 1265 | i += 17; |