diff options
author | Melanie | 2011-12-19 21:30:57 +0000 |
---|---|---|
committer | Melanie | 2011-12-19 21:30:57 +0000 |
commit | efa4284391d6098172c6b57fe8fa5e1d881a31ab (patch) | |
tree | ad5ecc940b428f93e977f096218c85f1d1e146bc /OpenSim/Framework/AvatarAppearance.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Stop sending the viewer its own AvatarAppearance packet. (diff) | |
download | opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.zip opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.tar.gz opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.tar.bz2 opensim-SC_OLD-efa4284391d6098172c6b57fe8fa5e1d881a31ab.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index f0580df..3a0b861 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -264,10 +264,12 @@ namespace OpenSim.Framework | |||
264 | } | 264 | } |
265 | 265 | ||
266 | /// <summary> | 266 | /// <summary> |
267 | /// Set up appearance textures. | 267 | /// Set up appearance texture ids. |
268 | /// Returns boolean that indicates whether the new entries actually change the | ||
269 | /// existing values. | ||
270 | /// </summary> | 268 | /// </summary> |
269 | /// <returns> | ||
270 | /// True if any existing texture id was changed by the new data. | ||
271 | /// False if there were no changes or no existing texture ids. | ||
272 | /// </returns> | ||
271 | public virtual bool SetTextureEntries(Primitive.TextureEntry textureEntry) | 273 | public virtual bool SetTextureEntries(Primitive.TextureEntry textureEntry) |
272 | { | 274 | { |
273 | if (textureEntry == null) | 275 | if (textureEntry == null) |
@@ -284,25 +286,30 @@ namespace OpenSim.Framework | |||
284 | 286 | ||
285 | if (newface == null) | 287 | if (newface == null) |
286 | { | 288 | { |
287 | if (oldface == null) continue; | 289 | if (oldface == null) |
290 | continue; | ||
288 | } | 291 | } |
289 | else | 292 | else |
290 | { | 293 | { |
291 | if (oldface != null && oldface.TextureID == newface.TextureID) continue; | 294 | if (oldface != null && oldface.TextureID == newface.TextureID) |
295 | continue; | ||
292 | } | 296 | } |
293 | 297 | ||
294 | changed = true; | 298 | changed = true; |
295 | } | 299 | } |
296 | 300 | ||
297 | m_texture = textureEntry; | 301 | m_texture = textureEntry; |
302 | |||
298 | return changed; | 303 | return changed; |
299 | } | 304 | } |
300 | 305 | ||
301 | /// <summary> | 306 | /// <summary> |
302 | /// Set up visual parameters for the avatar and refresh the avatar height | 307 | /// Set up visual parameters for the avatar and refresh the avatar height |
303 | /// Returns boolean that indicates whether the new entries actually change the | ||
304 | /// existing values. | ||
305 | /// </summary> | 308 | /// </summary> |
309 | /// <returns> | ||
310 | /// True if any existing visual parameter was changed by the new data. | ||
311 | /// False if there were no changes or no existing visual parameters. | ||
312 | /// </returns> | ||
306 | public virtual bool SetVisualParams(byte[] visualParams) | 313 | public virtual bool SetVisualParams(byte[] visualParams) |
307 | { | 314 | { |
308 | if (visualParams == null) | 315 | if (visualParams == null) |