OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

primbasicshape: convert eventual MeshEP to SculpEP

0.9.1.0-post-fixes
UbitUmarov 2019-04-30 22:52:58 +01:00
parent 8994045d5f
commit 15dd033490
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -1039,6 +1039,7 @@ namespace OpenSim.Framework
const byte LightEP = 0x20; const byte LightEP = 0x20;
const byte SculptEP = 0x30; const byte SculptEP = 0x30;
const byte ProjectionEP = 0x40; const byte ProjectionEP = 0x40;
//const byte MeshEP = 0x60;
const byte MeshFlagsEP = 0x70; const byte MeshFlagsEP = 0x70;
int TotalBytesLength = 1; // ExtraParamsNum int TotalBytesLength = 1; // ExtraParamsNum
@ -1121,7 +1122,10 @@ namespace OpenSim.Framework
if (_sculptEntry) if (_sculptEntry)
{ {
returnBytes[i] = SculptEP; //if(_sculptType == 5)
// returnBytes[i] = MeshEP;
//else
returnBytes[i] = SculptEP;
i += 2; i += 2;
returnBytes[i] = 17; returnBytes[i] = 17;
i += 4; i += 4;
@ -1164,6 +1168,7 @@ namespace OpenSim.Framework
const ushort LightEP = 0x20; const ushort LightEP = 0x20;
const ushort SculptEP = 0x30; const ushort SculptEP = 0x30;
const ushort ProjectionEP = 0x40; const ushort ProjectionEP = 0x40;
const ushort MeshEP = 0x60;
const ushort MeshFlagsEP = 0x70; const ushort MeshFlagsEP = 0x70;
switch (type) switch (type)
@ -1186,6 +1191,7 @@ namespace OpenSim.Framework
ReadLightData(data, 0); ReadLightData(data, 0);
break; break;
case MeshEP:
case SculptEP: case SculptEP:
if (!inUse) if (!inUse)
{ {
@ -1231,6 +1237,7 @@ namespace OpenSim.Framework
const byte LightEP = 0x20; const byte LightEP = 0x20;
const byte SculptEP = 0x30; const byte SculptEP = 0x30;
const byte ProjectionEP = 0x40; const byte ProjectionEP = 0x40;
const byte MeshEP = 0x60;
const byte MeshFlagsEP = 0x70; const byte MeshFlagsEP = 0x70;
byte extraParamCount = data[0]; byte extraParamCount = data[0];
@ -1252,6 +1259,7 @@ namespace OpenSim.Framework
i += 16; i += 16;
break; break;
case MeshEP:
case SculptEP: case SculptEP:
ReadSculptData(data, i); ReadSculptData(data, i);
i += 17; i += 17;