aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PrimitiveBaseShape.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs32
1 files changed, 10 insertions, 22 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 98e583e..c29b973 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -26,9 +26,9 @@
26* 26*
27*/ 27*/
28 28
29using System;
29using System.Xml.Serialization; 30using System.Xml.Serialization;
30using libsecondlife; 31using libsecondlife;
31using System;
32 32
33namespace OpenSim.Framework 33namespace OpenSim.Framework
34{ 34{
@@ -91,32 +91,21 @@ namespace OpenSim.Framework
91 public sbyte PathTwist; 91 public sbyte PathTwist;
92 public sbyte PathTwistBegin; 92 public sbyte PathTwistBegin;
93 93
94 [XmlIgnore] 94 [XmlIgnore]
95 public LLObject.TextureEntry Textures 95 public LLObject.TextureEntry Textures
96 { 96 {
97 get 97 get { return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); }
98 {
99 return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
100 }
101 98
102 set 99 set { m_textureEntry = value.ToBytes(); }
103 {
104 m_textureEntry = value.ToBytes();
105 }
106 } 100 }
107 101
108 private byte[] m_textureEntry; 102 private byte[] m_textureEntry;
103
109 public byte[] TextureEntry 104 public byte[] TextureEntry
110 { 105 {
111 get 106 get { return m_textureEntry; }
112 {
113 return m_textureEntry;
114 }
115 107
116 set 108 set { m_textureEntry = value; }
117 {
118 m_textureEntry = value;
119 }
120 } 109 }
121 110
122 public byte[] ExtraParams; 111 public byte[] ExtraParams;
@@ -134,11 +123,11 @@ namespace OpenSim.Framework
134 [XmlIgnore] 123 [XmlIgnore]
135 public HollowShape HollowShape 124 public HollowShape HollowShape
136 { 125 {
137 get { return (HollowShape)(ProfileCurve & 0xf0); } 126 get { return (HollowShape) (ProfileCurve & 0xf0); }
138 set 127 set
139 { 128 {
140 byte oldValueMasked = (byte)(ProfileCurve & 0x0f); 129 byte oldValueMasked = (byte) (ProfileCurve & 0x0f);
141 ProfileCurve = (byte)(oldValueMasked | (byte)value); 130 ProfileCurve = (byte) (oldValueMasked | (byte) value);
142 } 131 }
143 } 132 }
144 133
@@ -147,7 +136,6 @@ namespace OpenSim.Framework
147 get { return Scale; } 136 get { return Scale; }
148 } 137 }
149 138
150
151 139
152 static PrimitiveBaseShape() 140 static PrimitiveBaseShape()
153 { 141 {