diff options
author | Master ScienceSim | 2010-10-28 09:00:39 -0700 |
---|---|---|
committer | Master ScienceSim | 2010-10-28 09:00:39 -0700 |
commit | 0f28fa400d1f853cc3c3ebd2707b08ed06d2f127 (patch) | |
tree | 7742c37af66e92492a8aedd20b7f39b99af86eee /OpenSim/Framework | |
parent | Small cleanup and add more debugging information (diff) | |
download | opensim-SC-0f28fa400d1f853cc3c3ebd2707b08ed06d2f127.zip opensim-SC-0f28fa400d1f853cc3c3ebd2707b08ed06d2f127.tar.gz opensim-SC-0f28fa400d1f853cc3c3ebd2707b08ed06d2f127.tar.bz2 opensim-SC-0f28fa400d1f853cc3c3ebd2707b08ed06d2f127.tar.xz |
Added background thread to handle delayed send and save of appearance
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 05330c7..e66a1e7 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -233,7 +233,7 @@ namespace OpenSim.Framework | |||
233 | // DEBUG ON | 233 | // DEBUG ON |
234 | m_log.WarnFormat("[AVATAR APPEARANCE] create empty appearance for {0}",owner); | 234 | m_log.WarnFormat("[AVATAR APPEARANCE] create empty appearance for {0}",owner); |
235 | // DEBUG OFF | 235 | // DEBUG OFF |
236 | m_serial = 0; | 236 | m_serial = 1; |
237 | m_owner = owner; | 237 | m_owner = owner; |
238 | 238 | ||
239 | SetDefaultWearables(); | 239 | SetDefaultWearables(); |
@@ -289,7 +289,7 @@ namespace OpenSim.Framework | |||
289 | // DEBUG OFF | 289 | // DEBUG OFF |
290 | if (appearance == null) | 290 | if (appearance == null) |
291 | { | 291 | { |
292 | m_serial = 0; | 292 | m_serial = 1; |
293 | m_owner = UUID.Zero; | 293 | m_owner = UUID.Zero; |
294 | 294 | ||
295 | SetDefaultWearables(); | 295 | SetDefaultWearables(); |
@@ -467,6 +467,9 @@ namespace OpenSim.Framework | |||
467 | public override String ToString() | 467 | public override String ToString() |
468 | { | 468 | { |
469 | String s = ""; | 469 | String s = ""; |
470 | |||
471 | s += String.Format("Serial: {0}\n",m_serial); | ||
472 | |||
470 | for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++) | 473 | for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++) |
471 | if (m_texture.FaceTextures[i] != null) | 474 | if (m_texture.FaceTextures[i] != null) |
472 | s += String.Format("Texture: {0} --> {1}\n",i,m_texture.FaceTextures[i].TextureID); | 475 | s += String.Format("Texture: {0} --> {1}\n",i,m_texture.FaceTextures[i].TextureID); |
@@ -625,8 +628,8 @@ namespace OpenSim.Framework | |||
625 | /// </summary> | 628 | /// </summary> |
626 | public void Unpack(OSDMap data) | 629 | public void Unpack(OSDMap data) |
627 | { | 630 | { |
628 | if ((data != null) && (data["appearance_serial"] != null)) | 631 | if ((data != null) && (data["serial"] != null)) |
629 | m_serial = data["appearance_serial"].AsInteger(); | 632 | m_serial = data["serial"].AsInteger(); |
630 | if ((data != null) && (data["height"] != null)) | 633 | if ((data != null) && (data["height"] != null)) |
631 | m_avatarHeight = (float)data["height"].AsReal(); | 634 | m_avatarHeight = (float)data["height"].AsReal(); |
632 | if ((data != null) && (data["hipoffset"] != null)) | 635 | if ((data != null) && (data["hipoffset"] != null)) |