diff options
author | opensim mirror account | 2010-10-29 15:50:06 -0700 |
---|---|---|
committer | opensim mirror account | 2010-10-29 15:50:06 -0700 |
commit | f6b88d620861cc943a60e9e7ea042dff3a159267 (patch) | |
tree | 2bf4401cb2e62cfe86ce505bdcf3a846fa6af9bd /OpenSim/Framework | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
parent | Rationalize the logging messages from the merged appearance branch, commentin... (diff) | |
download | opensim-SC-f6b88d620861cc943a60e9e7ea042dff3a159267.zip opensim-SC-f6b88d620861cc943a60e9e7ea042dff3a159267.tar.gz opensim-SC-f6b88d620861cc943a60e9e7ea042dff3a159267.tar.bz2 opensim-SC-f6b88d620861cc943a60e9e7ea042dff3a159267.tar.xz |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 35 | ||||
-rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 4 |
2 files changed, 16 insertions, 23 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index a4bb765..9494410 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -329,9 +329,8 @@ namespace OpenSim.Framework | |||
329 | 329 | ||
330 | public AvatarAppearance(UUID owner) | 330 | public AvatarAppearance(UUID owner) |
331 | { | 331 | { |
332 | // DEBUG ON | 332 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance for {0}",owner); |
333 | m_log.WarnFormat("[AVATAR APPEARANCE] create empty appearance for {0}",owner); | 333 | |
334 | // DEBUG OFF | ||
335 | m_serial = 1; | 334 | m_serial = 1; |
336 | m_owner = owner; | 335 | m_owner = owner; |
337 | 336 | ||
@@ -345,9 +344,8 @@ namespace OpenSim.Framework | |||
345 | 344 | ||
346 | public AvatarAppearance(UUID avatarID, OSDMap map) | 345 | public AvatarAppearance(UUID avatarID, OSDMap map) |
347 | { | 346 | { |
348 | // DEBUG ON | 347 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID); |
349 | m_log.WarnFormat("[AVATAR APPEARANCE] create appearance for {0} from OSDMap",avatarID); | 348 | |
350 | // DEBUG OFF | ||
351 | m_owner = avatarID; | 349 | m_owner = avatarID; |
352 | Unpack(map); | 350 | Unpack(map); |
353 | SetHeight(); | 351 | SetHeight(); |
@@ -355,9 +353,8 @@ namespace OpenSim.Framework | |||
355 | 353 | ||
356 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) | 354 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) |
357 | { | 355 | { |
358 | // DEBUG ON | 356 | // m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); |
359 | m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); | 357 | |
360 | // DEBUG OFF | ||
361 | m_serial = 1; | 358 | m_serial = 1; |
362 | m_owner = avatarID; | 359 | m_owner = avatarID; |
363 | 360 | ||
@@ -383,9 +380,8 @@ namespace OpenSim.Framework | |||
383 | 380 | ||
384 | public AvatarAppearance(AvatarAppearance appearance) | 381 | public AvatarAppearance(AvatarAppearance appearance) |
385 | { | 382 | { |
386 | // DEBUG ON | 383 | // m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); |
387 | m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); | 384 | |
388 | // DEBUG OFF | ||
389 | if (appearance == null) | 385 | if (appearance == null) |
390 | { | 386 | { |
391 | m_serial = 1; | 387 | m_serial = 1; |
@@ -479,10 +475,9 @@ namespace OpenSim.Framework | |||
479 | } | 475 | } |
480 | 476 | ||
481 | changed = true; | 477 | changed = true; |
482 | // DEBUG ON | 478 | |
483 | if (newface != null) | 479 | // if (newface != null) |
484 | m_log.WarnFormat("[AVATAR APPEARANCE] index {0}, new texture id {1}",i,newface.TextureID); | 480 | // m_log.WarnFormat("[AVATAR APPEARANCE]: index {0}, new texture id {1}",i,newface.TextureID); |
485 | // DEBUG OFF | ||
486 | } | 481 | } |
487 | 482 | ||
488 | m_texture = textureEntry; | 483 | m_texture = textureEntry; |
@@ -742,7 +737,7 @@ namespace OpenSim.Framework | |||
742 | } | 737 | } |
743 | else | 738 | else |
744 | { | 739 | { |
745 | m_log.Warn("[AVATARAPPEARANCE] failed to unpack wearables"); | 740 | m_log.Warn("[AVATAR APPEARANCE]: failed to unpack wearables"); |
746 | } | 741 | } |
747 | 742 | ||
748 | // Avatar Textures | 743 | // Avatar Textures |
@@ -760,7 +755,7 @@ namespace OpenSim.Framework | |||
760 | } | 755 | } |
761 | else | 756 | else |
762 | { | 757 | { |
763 | m_log.Warn("[AVATARAPPEARANCE] failed to unpack textures"); | 758 | m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures"); |
764 | } | 759 | } |
765 | 760 | ||
766 | // Visual Parameters | 761 | // Visual Parameters |
@@ -772,7 +767,7 @@ namespace OpenSim.Framework | |||
772 | } | 767 | } |
773 | else | 768 | else |
774 | { | 769 | { |
775 | m_log.Warn("[AVATARAPPEARANCE] failed to unpack visual parameters"); | 770 | m_log.Warn("[AVATAR APPEARANCE]: failed to unpack visual parameters"); |
776 | } | 771 | } |
777 | 772 | ||
778 | // Attachments | 773 | // Attachments |
@@ -786,7 +781,7 @@ namespace OpenSim.Framework | |||
786 | } | 781 | } |
787 | catch (Exception e) | 782 | catch (Exception e) |
788 | { | 783 | { |
789 | m_log.ErrorFormat("[AVATARAPPEARANCE] unpack failed badly: {0}",e.Message); | 784 | m_log.ErrorFormat("[AVATAR APPEARANCE]: unpack failed badly: {0}{1}", e.Message, e.StackTrace); |
790 | } | 785 | } |
791 | } | 786 | } |
792 | 787 | ||
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 872de9a..7b0e053 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
@@ -988,9 +988,7 @@ namespace OpenSim.Framework.Capabilities | |||
988 | 988 | ||
989 | public void BakedTextureUploaded(UUID assetID, byte[] data) | 989 | public void BakedTextureUploaded(UUID assetID, byte[] data) |
990 | { | 990 | { |
991 | // DEBUG ON | 991 | // m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); |
992 | m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); | ||
993 | // DEBUG OFF | ||
994 | AssetBase asset; | 992 | AssetBase asset; |
995 | asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); | 993 | asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); |
996 | asset.Data = data; | 994 | asset.Data = data; |