diff options
author | Sean Dague | 2008-06-25 19:18:51 +0000 |
---|---|---|
committer | Sean Dague | 2008-06-25 19:18:51 +0000 |
commit | 5158aad662f3b6af788c729b3e68f76c92b3279b (patch) | |
tree | 2264484b03db489cf534f0a7be1fca0a664202c3 /OpenSim/Framework/AvatarAppearance.cs | |
parent | add migrations to mysql and sqlite for flags on embedded inventory (diff) | |
download | opensim-SC-5158aad662f3b6af788c729b3e68f76c92b3279b.zip opensim-SC-5158aad662f3b6af788c729b3e68f76c92b3279b.tar.gz opensim-SC-5158aad662f3b6af788c729b3e68f76c92b3279b.tar.bz2 opensim-SC-5158aad662f3b6af788c729b3e68f76c92b3279b.tar.xz |
make lots of properties virtual, which lets nhibernate do
some proxy object optimizations.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 676283c..4456138 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -71,14 +71,14 @@ namespace OpenSim.Framework | |||
71 | 71 | ||
72 | protected LLUUID m_owner; | 72 | protected LLUUID m_owner; |
73 | 73 | ||
74 | public LLUUID Owner | 74 | public virtual LLUUID Owner |
75 | { | 75 | { |
76 | get { return m_owner; } | 76 | get { return m_owner; } |
77 | set { m_owner = value; } | 77 | set { m_owner = value; } |
78 | } | 78 | } |
79 | protected int m_serial = 1; | 79 | protected int m_serial = 1; |
80 | 80 | ||
81 | public int Serial | 81 | public virtual int Serial |
82 | { | 82 | { |
83 | get { return m_serial; } | 83 | get { return m_serial; } |
84 | set { m_serial = value; } | 84 | set { m_serial = value; } |
@@ -86,7 +86,7 @@ namespace OpenSim.Framework | |||
86 | 86 | ||
87 | protected byte[] m_visualparams; | 87 | protected byte[] m_visualparams; |
88 | 88 | ||
89 | public byte[] VisualParams | 89 | public virtual byte[] VisualParams |
90 | { | 90 | { |
91 | get { return m_visualparams; } | 91 | get { return m_visualparams; } |
92 | set { m_visualparams = value; } | 92 | set { m_visualparams = value; } |
@@ -94,118 +94,118 @@ namespace OpenSim.Framework | |||
94 | 94 | ||
95 | protected AvatarWearable[] m_wearables; | 95 | protected AvatarWearable[] m_wearables; |
96 | 96 | ||
97 | public AvatarWearable[] Wearables | 97 | public virtual AvatarWearable[] Wearables |
98 | { | 98 | { |
99 | get { return m_wearables; } | 99 | get { return m_wearables; } |
100 | set { m_wearables = value; } | 100 | set { m_wearables = value; } |
101 | } | 101 | } |
102 | 102 | ||
103 | public LLUUID BodyItem { | 103 | public virtual LLUUID BodyItem { |
104 | get { return m_wearables[BODY].ItemID; } | 104 | get { return m_wearables[BODY].ItemID; } |
105 | set { m_wearables[BODY].ItemID = value; } | 105 | set { m_wearables[BODY].ItemID = value; } |
106 | } | 106 | } |
107 | public LLUUID BodyAsset { | 107 | public virtual LLUUID BodyAsset { |
108 | get { return m_wearables[BODY].AssetID; } | 108 | get { return m_wearables[BODY].AssetID; } |
109 | set { m_wearables[BODY].AssetID = value; } | 109 | set { m_wearables[BODY].AssetID = value; } |
110 | } | 110 | } |
111 | public LLUUID SkinItem { | 111 | public virtual LLUUID SkinItem { |
112 | get { return m_wearables[SKIN].ItemID; } | 112 | get { return m_wearables[SKIN].ItemID; } |
113 | set { m_wearables[SKIN].ItemID = value; } | 113 | set { m_wearables[SKIN].ItemID = value; } |
114 | } | 114 | } |
115 | public LLUUID SkinAsset { | 115 | public virtual LLUUID SkinAsset { |
116 | get { return m_wearables[SKIN].AssetID; } | 116 | get { return m_wearables[SKIN].AssetID; } |
117 | set { m_wearables[SKIN].AssetID = value; } | 117 | set { m_wearables[SKIN].AssetID = value; } |
118 | } | 118 | } |
119 | public LLUUID HairItem { | 119 | public virtual LLUUID HairItem { |
120 | get { return m_wearables[HAIR].ItemID; } | 120 | get { return m_wearables[HAIR].ItemID; } |
121 | set { m_wearables[HAIR].ItemID = value; } | 121 | set { m_wearables[HAIR].ItemID = value; } |
122 | } | 122 | } |
123 | public LLUUID HairAsset { | 123 | public virtual LLUUID HairAsset { |
124 | get { return m_wearables[HAIR].AssetID; } | 124 | get { return m_wearables[HAIR].AssetID; } |
125 | set { m_wearables[HAIR].AssetID = value; } | 125 | set { m_wearables[HAIR].AssetID = value; } |
126 | } | 126 | } |
127 | public LLUUID EyesItem { | 127 | public virtual LLUUID EyesItem { |
128 | get { return m_wearables[EYES].ItemID; } | 128 | get { return m_wearables[EYES].ItemID; } |
129 | set { m_wearables[EYES].ItemID = value; } | 129 | set { m_wearables[EYES].ItemID = value; } |
130 | } | 130 | } |
131 | public LLUUID EyesAsset { | 131 | public virtual LLUUID EyesAsset { |
132 | get { return m_wearables[EYES].AssetID; } | 132 | get { return m_wearables[EYES].AssetID; } |
133 | set { m_wearables[EYES].AssetID = value; } | 133 | set { m_wearables[EYES].AssetID = value; } |
134 | } | 134 | } |
135 | public LLUUID ShirtItem { | 135 | public virtual LLUUID ShirtItem { |
136 | get { return m_wearables[SHIRT].ItemID; } | 136 | get { return m_wearables[SHIRT].ItemID; } |
137 | set { m_wearables[SHIRT].ItemID = value; } | 137 | set { m_wearables[SHIRT].ItemID = value; } |
138 | } | 138 | } |
139 | public LLUUID ShirtAsset { | 139 | public virtual LLUUID ShirtAsset { |
140 | get { return m_wearables[SHIRT].AssetID; } | 140 | get { return m_wearables[SHIRT].AssetID; } |
141 | set { m_wearables[SHIRT].AssetID = value; } | 141 | set { m_wearables[SHIRT].AssetID = value; } |
142 | } | 142 | } |
143 | public LLUUID PantsItem { | 143 | public virtual LLUUID PantsItem { |
144 | get { return m_wearables[PANTS].ItemID; } | 144 | get { return m_wearables[PANTS].ItemID; } |
145 | set { m_wearables[PANTS].ItemID = value; } | 145 | set { m_wearables[PANTS].ItemID = value; } |
146 | } | 146 | } |
147 | public LLUUID PantsAsset { | 147 | public virtual LLUUID PantsAsset { |
148 | get { return m_wearables[PANTS].AssetID; } | 148 | get { return m_wearables[PANTS].AssetID; } |
149 | set { m_wearables[PANTS].AssetID = value; } | 149 | set { m_wearables[PANTS].AssetID = value; } |
150 | } | 150 | } |
151 | public LLUUID ShoesItem { | 151 | public virtual LLUUID ShoesItem { |
152 | get { return m_wearables[SHOES].ItemID; } | 152 | get { return m_wearables[SHOES].ItemID; } |
153 | set { m_wearables[SHOES].ItemID = value; } | 153 | set { m_wearables[SHOES].ItemID = value; } |
154 | } | 154 | } |
155 | public LLUUID ShoesAsset { | 155 | public virtual LLUUID ShoesAsset { |
156 | get { return m_wearables[SHOES].AssetID; } | 156 | get { return m_wearables[SHOES].AssetID; } |
157 | set { m_wearables[SHOES].AssetID = value; } | 157 | set { m_wearables[SHOES].AssetID = value; } |
158 | } | 158 | } |
159 | public LLUUID SocksItem { | 159 | public virtual LLUUID SocksItem { |
160 | get { return m_wearables[SOCKS].ItemID; } | 160 | get { return m_wearables[SOCKS].ItemID; } |
161 | set { m_wearables[SOCKS].ItemID = value; } | 161 | set { m_wearables[SOCKS].ItemID = value; } |
162 | } | 162 | } |
163 | public LLUUID SocksAsset { | 163 | public virtual LLUUID SocksAsset { |
164 | get { return m_wearables[SOCKS].AssetID; } | 164 | get { return m_wearables[SOCKS].AssetID; } |
165 | set { m_wearables[SOCKS].AssetID = value; } | 165 | set { m_wearables[SOCKS].AssetID = value; } |
166 | } | 166 | } |
167 | public LLUUID JacketItem { | 167 | public virtual LLUUID JacketItem { |
168 | get { return m_wearables[JACKET].ItemID; } | 168 | get { return m_wearables[JACKET].ItemID; } |
169 | set { m_wearables[JACKET].ItemID = value; } | 169 | set { m_wearables[JACKET].ItemID = value; } |
170 | } | 170 | } |
171 | public LLUUID JacketAsset { | 171 | public virtual LLUUID JacketAsset { |
172 | get { return m_wearables[JACKET].AssetID; } | 172 | get { return m_wearables[JACKET].AssetID; } |
173 | set { m_wearables[JACKET].AssetID = value; } | 173 | set { m_wearables[JACKET].AssetID = value; } |
174 | } | 174 | } |
175 | public LLUUID GlovesItem { | 175 | public virtual LLUUID GlovesItem { |
176 | get { return m_wearables[GLOVES].ItemID; } | 176 | get { return m_wearables[GLOVES].ItemID; } |
177 | set { m_wearables[GLOVES].ItemID = value; } | 177 | set { m_wearables[GLOVES].ItemID = value; } |
178 | } | 178 | } |
179 | public LLUUID GlovesAsset { | 179 | public virtual LLUUID GlovesAsset { |
180 | get { return m_wearables[GLOVES].AssetID; } | 180 | get { return m_wearables[GLOVES].AssetID; } |
181 | set { m_wearables[GLOVES].AssetID = value; } | 181 | set { m_wearables[GLOVES].AssetID = value; } |
182 | } | 182 | } |
183 | public LLUUID UnderShirtItem { | 183 | public virtual LLUUID UnderShirtItem { |
184 | get { return m_wearables[UNDERSHIRT].ItemID; } | 184 | get { return m_wearables[UNDERSHIRT].ItemID; } |
185 | set { m_wearables[UNDERSHIRT].ItemID = value; } | 185 | set { m_wearables[UNDERSHIRT].ItemID = value; } |
186 | } | 186 | } |
187 | public LLUUID UnderShirtAsset { | 187 | public virtual LLUUID UnderShirtAsset { |
188 | get { return m_wearables[UNDERSHIRT].AssetID; } | 188 | get { return m_wearables[UNDERSHIRT].AssetID; } |
189 | set { m_wearables[UNDERSHIRT].AssetID = value; } | 189 | set { m_wearables[UNDERSHIRT].AssetID = value; } |
190 | } | 190 | } |
191 | public LLUUID UnderPantsItem { | 191 | public virtual LLUUID UnderPantsItem { |
192 | get { return m_wearables[UNDERPANTS].ItemID; } | 192 | get { return m_wearables[UNDERPANTS].ItemID; } |
193 | set { m_wearables[UNDERPANTS].ItemID = value; } | 193 | set { m_wearables[UNDERPANTS].ItemID = value; } |
194 | } | 194 | } |
195 | public LLUUID UnderPantsAsset { | 195 | public virtual LLUUID UnderPantsAsset { |
196 | get { return m_wearables[UNDERPANTS].AssetID; } | 196 | get { return m_wearables[UNDERPANTS].AssetID; } |
197 | set { m_wearables[UNDERPANTS].AssetID = value; } | 197 | set { m_wearables[UNDERPANTS].AssetID = value; } |
198 | } | 198 | } |
199 | public LLUUID SkirtItem { | 199 | public virtual LLUUID SkirtItem { |
200 | get { return m_wearables[SKIRT].ItemID; } | 200 | get { return m_wearables[SKIRT].ItemID; } |
201 | set { m_wearables[SKIRT].ItemID = value; } | 201 | set { m_wearables[SKIRT].ItemID = value; } |
202 | } | 202 | } |
203 | public LLUUID SkirtAsset { | 203 | public virtual LLUUID SkirtAsset { |
204 | get { return m_wearables[SKIRT].AssetID; } | 204 | get { return m_wearables[SKIRT].AssetID; } |
205 | set { m_wearables[SKIRT].AssetID = value; } | 205 | set { m_wearables[SKIRT].AssetID = value; } |
206 | } | 206 | } |
207 | 207 | ||
208 | public void SetDefaultWearables() | 208 | public virtual void SetDefaultWearables() |
209 | { | 209 | { |
210 | m_wearables[BODY].AssetID = BODY_ASSET; | 210 | m_wearables[BODY].AssetID = BODY_ASSET; |
211 | m_wearables[BODY].ItemID = BODY_ITEM; | 211 | m_wearables[BODY].ItemID = BODY_ITEM; |
@@ -219,7 +219,7 @@ namespace OpenSim.Framework | |||
219 | 219 | ||
220 | protected LLObject.TextureEntry m_texture; | 220 | protected LLObject.TextureEntry m_texture; |
221 | 221 | ||
222 | public LLObject.TextureEntry Texture | 222 | public virtual LLObject.TextureEntry Texture |
223 | { | 223 | { |
224 | get { return m_texture; } | 224 | get { return m_texture; } |
225 | set { m_texture = value; } | 225 | set { m_texture = value; } |
@@ -227,7 +227,7 @@ namespace OpenSim.Framework | |||
227 | 227 | ||
228 | protected float m_avatarHeight = 0; | 228 | protected float m_avatarHeight = 0; |
229 | 229 | ||
230 | public float AvatarHeight | 230 | public virtual float AvatarHeight |
231 | { | 231 | { |
232 | get { return m_avatarHeight; } | 232 | get { return m_avatarHeight; } |
233 | set { m_avatarHeight = value; } | 233 | set { m_avatarHeight = value; } |
@@ -262,7 +262,7 @@ namespace OpenSim.Framework | |||
262 | /// </summary> | 262 | /// </summary> |
263 | /// <param name="texture"></param> | 263 | /// <param name="texture"></param> |
264 | /// <param name="visualParam"></param> | 264 | /// <param name="visualParam"></param> |
265 | public void SetAppearance(byte[] texture, List<byte> visualParam) | 265 | public virtual void SetAppearance(byte[] texture, List<byte> visualParam) |
266 | { | 266 | { |
267 | LLObject.TextureEntry textureEnt = new LLObject.TextureEntry(texture, 0, texture.Length); | 267 | LLObject.TextureEntry textureEnt = new LLObject.TextureEntry(texture, 0, texture.Length); |
268 | m_texture = textureEnt; | 268 | m_texture = textureEnt; |
@@ -276,7 +276,7 @@ namespace OpenSim.Framework | |||
276 | + (((float) m_visualparams[125]/255.0f)/1.5f); | 276 | + (((float) m_visualparams[125]/255.0f)/1.5f); |
277 | } | 277 | } |
278 | 278 | ||
279 | public void SetWearable(int wearableId, AvatarWearable wearable) | 279 | public virtual void SetWearable(int wearableId, AvatarWearable wearable) |
280 | { | 280 | { |
281 | m_wearables[wearableId] = wearable; | 281 | m_wearables[wearableId] = wearable; |
282 | } | 282 | } |
@@ -327,7 +327,7 @@ namespace OpenSim.Framework | |||
327 | } | 327 | } |
328 | 328 | ||
329 | // this is used for OGS1 | 329 | // this is used for OGS1 |
330 | public Hashtable ToHashTable() | 330 | public virtual Hashtable ToHashTable() |
331 | { | 331 | { |
332 | Hashtable h = new Hashtable(); | 332 | Hashtable h = new Hashtable(); |
333 | h["owner"] = Owner.ToString(); | 333 | h["owner"] = Owner.ToString(); |