diff options
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index f378e96..ee60622 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -101,9 +101,8 @@ namespace OpenSim.Framework | |||
101 | 101 | ||
102 | public AvatarAppearance(UUID owner) | 102 | public AvatarAppearance(UUID owner) |
103 | { | 103 | { |
104 | // DEBUG ON | 104 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance for {0}",owner); |
105 | m_log.WarnFormat("[AVATAR APPEARANCE] create empty appearance for {0}",owner); | 105 | |
106 | // DEBUG OFF | ||
107 | m_serial = 1; | 106 | m_serial = 1; |
108 | m_owner = owner; | 107 | m_owner = owner; |
109 | 108 | ||
@@ -117,9 +116,8 @@ namespace OpenSim.Framework | |||
117 | 116 | ||
118 | public AvatarAppearance(UUID avatarID, OSDMap map) | 117 | public AvatarAppearance(UUID avatarID, OSDMap map) |
119 | { | 118 | { |
120 | // DEBUG ON | 119 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID); |
121 | m_log.WarnFormat("[AVATAR APPEARANCE] create appearance for {0} from OSDMap",avatarID); | 120 | |
122 | // DEBUG OFF | ||
123 | m_owner = avatarID; | 121 | m_owner = avatarID; |
124 | Unpack(map); | 122 | Unpack(map); |
125 | SetHeight(); | 123 | SetHeight(); |
@@ -127,9 +125,8 @@ namespace OpenSim.Framework | |||
127 | 125 | ||
128 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) | 126 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) |
129 | { | 127 | { |
130 | // DEBUG ON | 128 | // m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); |
131 | m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); | 129 | |
132 | // DEBUG OFF | ||
133 | m_serial = 1; | 130 | m_serial = 1; |
134 | m_owner = avatarID; | 131 | m_owner = avatarID; |
135 | 132 | ||
@@ -155,9 +152,8 @@ namespace OpenSim.Framework | |||
155 | 152 | ||
156 | public AvatarAppearance(AvatarAppearance appearance) | 153 | public AvatarAppearance(AvatarAppearance appearance) |
157 | { | 154 | { |
158 | // DEBUG ON | 155 | // m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); |
159 | m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); | 156 | |
160 | // DEBUG OFF | ||
161 | if (appearance == null) | 157 | if (appearance == null) |
162 | { | 158 | { |
163 | m_serial = 1; | 159 | m_serial = 1; |
@@ -251,10 +247,9 @@ namespace OpenSim.Framework | |||
251 | } | 247 | } |
252 | 248 | ||
253 | changed = true; | 249 | changed = true; |
254 | // DEBUG ON | 250 | |
255 | if (newface != null) | 251 | // if (newface != null) |
256 | m_log.WarnFormat("[AVATAR APPEARANCE] index {0}, new texture id {1}",i,newface.TextureID); | 252 | // m_log.WarnFormat("[AVATAR APPEARANCE]: index {0}, new texture id {1}",i,newface.TextureID); |
257 | // DEBUG OFF | ||
258 | } | 253 | } |
259 | 254 | ||
260 | m_texture = textureEntry; | 255 | m_texture = textureEntry; |
@@ -519,7 +514,7 @@ namespace OpenSim.Framework | |||
519 | } | 514 | } |
520 | else | 515 | else |
521 | { | 516 | { |
522 | m_log.Warn("[AVATARAPPEARANCE] failed to unpack wearables"); | 517 | m_log.Warn("[AVATAR APPEARANCE]: failed to unpack wearables"); |
523 | } | 518 | } |
524 | 519 | ||
525 | // Avatar Textures | 520 | // Avatar Textures |
@@ -537,7 +532,7 @@ namespace OpenSim.Framework | |||
537 | } | 532 | } |
538 | else | 533 | else |
539 | { | 534 | { |
540 | m_log.Warn("[AVATARAPPEARANCE] failed to unpack textures"); | 535 | m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures"); |
541 | } | 536 | } |
542 | 537 | ||
543 | // Visual Parameters | 538 | // Visual Parameters |
@@ -549,7 +544,7 @@ namespace OpenSim.Framework | |||
549 | } | 544 | } |
550 | else | 545 | else |
551 | { | 546 | { |
552 | m_log.Warn("[AVATARAPPEARANCE] failed to unpack visual parameters"); | 547 | m_log.Warn("[AVATAR APPEARANCE]: failed to unpack visual parameters"); |
553 | } | 548 | } |
554 | 549 | ||
555 | // Attachments | 550 | // Attachments |
@@ -563,7 +558,7 @@ namespace OpenSim.Framework | |||
563 | } | 558 | } |
564 | catch (Exception e) | 559 | catch (Exception e) |
565 | { | 560 | { |
566 | m_log.ErrorFormat("[AVATARAPPEARANCE] unpack failed badly: {0}",e.Message); | 561 | m_log.ErrorFormat("[AVATAR APPEARANCE]: unpack failed badly: {0}{1}", e.Message, e.StackTrace); |
567 | } | 562 | } |
568 | } | 563 | } |
569 | 564 | ||