diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Framework/PrimitiveBaseShape.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 4c36819..c8a5376 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -105,6 +105,7 @@ namespace OpenSim.Framework | |||
105 | private ushort _profileHollow; | 105 | private ushort _profileHollow; |
106 | private Vector3 _scale; | 106 | private Vector3 _scale; |
107 | private byte _state; | 107 | private byte _state; |
108 | private byte _lastattach; | ||
108 | private ProfileShape _profileShape; | 109 | private ProfileShape _profileShape; |
109 | private HollowShape _hollowShape; | 110 | private HollowShape _hollowShape; |
110 | 111 | ||
@@ -207,6 +208,7 @@ namespace OpenSim.Framework | |||
207 | PCode = (byte)prim.PrimData.PCode; | 208 | PCode = (byte)prim.PrimData.PCode; |
208 | 209 | ||
209 | State = prim.PrimData.State; | 210 | State = prim.PrimData.State; |
211 | LastAttachPoint = prim.PrimData.State; | ||
210 | PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin); | 212 | PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin); |
211 | PathEnd = Primitive.PackEndCut(prim.PrimData.PathEnd); | 213 | PathEnd = Primitive.PackEndCut(prim.PrimData.PathEnd); |
212 | PathScaleX = Primitive.PackPathScale(prim.PrimData.PathScaleX); | 214 | PathScaleX = Primitive.PackPathScale(prim.PrimData.PathScaleX); |
@@ -583,6 +585,15 @@ namespace OpenSim.Framework | |||
583 | } | 585 | } |
584 | } | 586 | } |
585 | 587 | ||
588 | public byte LastAttachPoint { | ||
589 | get { | ||
590 | return _lastattach; | ||
591 | } | ||
592 | set { | ||
593 | _lastattach = value; | ||
594 | } | ||
595 | } | ||
596 | |||
586 | public ProfileShape ProfileShape { | 597 | public ProfileShape ProfileShape { |
587 | get { | 598 | get { |
588 | return _profileShape; | 599 | return _profileShape; |
@@ -622,6 +633,8 @@ namespace OpenSim.Framework | |||
622 | } | 633 | } |
623 | } | 634 | } |
624 | 635 | ||
636 | // This is only used at runtime. For sculpties this holds the texture data, and for meshes | ||
637 | // the mesh data. | ||
625 | public byte[] SculptData | 638 | public byte[] SculptData |
626 | { | 639 | { |
627 | get | 640 | get |
@@ -1147,14 +1160,13 @@ namespace OpenSim.Framework | |||
1147 | 1160 | ||
1148 | public void ReadSculptData(byte[] data, int pos) | 1161 | public void ReadSculptData(byte[] data, int pos) |
1149 | { | 1162 | { |
1150 | byte[] SculptTextureUUID = new byte[16]; | 1163 | UUID SculptUUID; |
1151 | UUID SculptUUID = UUID.Zero; | 1164 | byte SculptTypel; |
1152 | byte SculptTypel = data[16+pos]; | ||
1153 | 1165 | ||
1154 | if (data.Length+pos >= 17) | 1166 | if (data.Length-pos >= 17) |
1155 | { | 1167 | { |
1156 | _sculptEntry = true; | 1168 | _sculptEntry = true; |
1157 | SculptTextureUUID = new byte[16]; | 1169 | byte[] SculptTextureUUID = new byte[16]; |
1158 | SculptTypel = data[16 + pos]; | 1170 | SculptTypel = data[16 + pos]; |
1159 | Array.Copy(data, pos, SculptTextureUUID,0, 16); | 1171 | Array.Copy(data, pos, SculptTextureUUID,0, 16); |
1160 | SculptUUID = new UUID(SculptTextureUUID, 0); | 1172 | SculptUUID = new UUID(SculptTextureUUID, 0); |