diff options
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index ef74b54..f244b51 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Framework | |||
128 | [XmlIgnore] private bool _flexiEntry = false; | 128 | [XmlIgnore] private bool _flexiEntry = false; |
129 | [XmlIgnore] private bool _lightEntry = false; | 129 | [XmlIgnore] private bool _lightEntry = false; |
130 | [XmlIgnore] private bool _sculptEntry = false; | 130 | [XmlIgnore] private bool _sculptEntry = false; |
131 | 131 | ||
132 | public byte ProfileCurve | 132 | public byte ProfileCurve |
133 | { | 133 | { |
134 | get { return (byte)((byte)HollowShape | (byte)ProfileShape); } | 134 | get { return (byte)((byte)HollowShape | (byte)ProfileShape); } |
@@ -185,10 +185,10 @@ namespace OpenSim.Framework | |||
185 | [XmlIgnore] | 185 | [XmlIgnore] |
186 | public LLObject.TextureEntry Textures | 186 | public LLObject.TextureEntry Textures |
187 | { | 187 | { |
188 | get | 188 | get |
189 | { | 189 | { |
190 | //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); | 190 | //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); |
191 | return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); | 191 | return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); |
192 | } | 192 | } |
193 | 193 | ||
194 | set { m_textureEntry = value.ToBytes(); } | 194 | set { m_textureEntry = value.ToBytes(); } |
@@ -198,12 +198,12 @@ namespace OpenSim.Framework | |||
198 | { | 198 | { |
199 | get { return m_textureEntry; } | 199 | get { return m_textureEntry; } |
200 | 200 | ||
201 | set | 201 | set |
202 | { | 202 | { |
203 | if (value == null) | 203 | if (value == null) |
204 | m_textureEntry = new byte[1]; | 204 | m_textureEntry = new byte[1]; |
205 | else | 205 | else |
206 | m_textureEntry = value; | 206 | m_textureEntry = value; |
207 | } | 207 | } |
208 | } | 208 | } |
209 | 209 | ||
@@ -302,7 +302,7 @@ namespace OpenSim.Framework | |||
302 | _profileBegin = LLObject.PackBeginCut(profileRange.X); | 302 | _profileBegin = LLObject.PackBeginCut(profileRange.X); |
303 | _profileEnd = LLObject.PackEndCut(profileRange.Y); | 303 | _profileEnd = LLObject.PackEndCut(profileRange.Y); |
304 | } | 304 | } |
305 | 305 | ||
306 | public byte[] ExtraParams | 306 | public byte[] ExtraParams |
307 | { | 307 | { |
308 | get | 308 | get |
@@ -941,7 +941,7 @@ namespace OpenSim.Framework | |||
941 | 941 | ||
942 | return data; | 942 | return data; |
943 | } | 943 | } |
944 | 944 | ||
945 | public void ReadFlexiData(byte[] data, int pos) | 945 | public void ReadFlexiData(byte[] data, int pos) |
946 | { | 946 | { |
947 | if (data.Length-pos >= 16) | 947 | if (data.Length-pos >= 16) |
@@ -972,7 +972,7 @@ namespace OpenSim.Framework | |||
972 | _flexiForceZ = 0f; | 972 | _flexiForceZ = 0f; |
973 | } | 973 | } |
974 | } | 974 | } |
975 | 975 | ||
976 | public byte[] GetFlexiBytes() | 976 | public byte[] GetFlexiBytes() |
977 | { | 977 | { |
978 | byte[] data = new byte[16]; | 978 | byte[] data = new byte[16]; |
@@ -991,7 +991,7 @@ namespace OpenSim.Framework | |||
991 | 991 | ||
992 | return data; | 992 | return data; |
993 | } | 993 | } |
994 | 994 | ||
995 | public void ReadLightData(byte[] data, int pos) | 995 | public void ReadLightData(byte[] data, int pos) |
996 | { | 996 | { |
997 | if (data.Length - pos >= 16) | 997 | if (data.Length - pos >= 16) |
@@ -1021,7 +1021,7 @@ namespace OpenSim.Framework | |||
1021 | _lightIntensity = 0f; | 1021 | _lightIntensity = 0f; |
1022 | } | 1022 | } |
1023 | } | 1023 | } |
1024 | 1024 | ||
1025 | public byte[] GetLightBytes() | 1025 | public byte[] GetLightBytes() |
1026 | { | 1026 | { |
1027 | byte[] data = new byte[16]; | 1027 | byte[] data = new byte[16]; |