diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Framework/AvatarAppearance.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 07c739d..77a7621 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Framework | |||
53 | // should be only used as initial default value ( V1 viewers ) | 53 | // should be only used as initial default value ( V1 viewers ) |
54 | public readonly static int VISUALPARAM_COUNT = 218; | 54 | public readonly static int VISUALPARAM_COUNT = 218; |
55 | 55 | ||
56 | // public readonly static int TEXTURE_COUNT = 21 | 56 | // public readonly static int TEXTURE_COUNT = 21 |
57 | // 21 bad, make it be updated as libovm gets update | 57 | // 21 bad, make it be updated as libovm gets update |
58 | // also keeping in sync with it | 58 | // also keeping in sync with it |
59 | public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES; | 59 | public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES; |
@@ -121,7 +121,7 @@ namespace OpenSim.Framework | |||
121 | get { return m_avatarHeight; } | 121 | get { return m_avatarHeight; } |
122 | set { m_avatarHeight = value; } | 122 | set { m_avatarHeight = value; } |
123 | } | 123 | } |
124 | 124 | ||
125 | public virtual WearableCacheItem[] WearableCacheItems | 125 | public virtual WearableCacheItem[] WearableCacheItems |
126 | { | 126 | { |
127 | get { return m_cacheitems; } | 127 | get { return m_cacheitems; } |
@@ -219,7 +219,7 @@ namespace OpenSim.Framework | |||
219 | m_wearables[i] = new AvatarWearable(); | 219 | m_wearables[i] = new AvatarWearable(); |
220 | AvatarWearable wearable = appearance.Wearables[i]; | 220 | AvatarWearable wearable = appearance.Wearables[i]; |
221 | for (int j = 0; j < wearable.Count; j++) | 221 | for (int j = 0; j < wearable.Count; j++) |
222 | m_wearables[i].Add(wearable[j].ItemID, wearable[j].AssetID); | 222 | m_wearables[i].Add(wearable[j].ItemID, wearable[j].AssetID); |
223 | } | 223 | } |
224 | } | 224 | } |
225 | else | 225 | else |
@@ -291,18 +291,18 @@ namespace OpenSim.Framework | |||
291 | public virtual void ResetAppearance() | 291 | public virtual void ResetAppearance() |
292 | { | 292 | { |
293 | // m_log.WarnFormat("[AVATAR APPEARANCE]: Reset appearance"); | 293 | // m_log.WarnFormat("[AVATAR APPEARANCE]: Reset appearance"); |
294 | 294 | ||
295 | m_serial = 0; | 295 | m_serial = 0; |
296 | 296 | ||
297 | SetDefaultTexture(); | 297 | SetDefaultTexture(); |
298 | 298 | ||
299 | //for (int i = 0; i < BAKE_INDICES.Length; i++) | 299 | //for (int i = 0; i < BAKE_INDICES.Length; i++) |
300 | // { | 300 | // { |
301 | // int idx = BAKE_INDICES[i]; | 301 | // int idx = BAKE_INDICES[i]; |
302 | // m_texture.FaceTextures[idx].TextureID = UUID.Zero; | 302 | // m_texture.FaceTextures[idx].TextureID = UUID.Zero; |
303 | // } | 303 | // } |
304 | } | 304 | } |
305 | 305 | ||
306 | protected virtual void SetDefaultParams() | 306 | protected virtual void SetDefaultParams() |
307 | { | 307 | { |
308 | m_visualparams = new byte[] { 33,61,85,23,58,127,63,85,63,42,0,85,63,36,85,95,153,63,34,0,63,109,88,132,63,136,81,85,103,136,127,0,150,150,150,127,0,0,0,0,0,127,0,0,255,127,114,127,99,63,127,140,127,127,0,0,0,191,0,104,0,0,0,0,0,0,0,0,0,145,216,133,0,127,0,127,170,0,0,127,127,109,85,127,127,63,85,42,150,150,150,150,150,150,150,25,150,150,150,0,127,0,0,144,85,127,132,127,85,0,127,127,127,127,127,127,59,127,85,127,127,106,47,79,127,127,204,2,141,66,0,0,127,127,0,0,0,0,127,0,159,0,0,178,127,36,85,131,127,127,127,153,95,0,140,75,27,127,127,0,150,150,198,0,0,63,30,127,165,209,198,127,127,153,204,51,51,255,255,255,204,0,255,150,150,150,150,150,150,150,150,150,150,0,150,150,150,150,150,0,127,127,150,150,150,150,150,150,150,150,0,0,150,51,132,150,150,150 }; | 308 | m_visualparams = new byte[] { 33,61,85,23,58,127,63,85,63,42,0,85,63,36,85,95,153,63,34,0,63,109,88,132,63,136,81,85,103,136,127,0,150,150,150,127,0,0,0,0,0,127,0,0,255,127,114,127,99,63,127,140,127,127,0,0,0,191,0,104,0,0,0,0,0,0,0,0,0,145,216,133,0,127,0,127,170,0,0,127,127,109,85,127,127,63,85,42,150,150,150,150,150,150,150,25,150,150,150,0,127,0,0,144,85,127,132,127,85,0,127,127,127,127,127,127,59,127,85,127,127,106,47,79,127,127,204,2,141,66,0,0,127,127,0,0,0,0,127,0,159,0,0,178,127,36,85,131,127,127,127,153,95,0,140,75,27,127,127,0,150,150,198,0,0,63,30,127,165,209,198,127,127,153,204,51,51,255,255,255,204,0,255,150,150,150,150,150,150,150,150,150,150,0,150,150,150,150,150,0,127,127,150,150,150,150,150,150,150,150,0,0,150,51,132,150,150,150 }; |
@@ -319,14 +319,14 @@ namespace OpenSim.Framework | |||
319 | public virtual void ResetBakedTextures() | 319 | public virtual void ResetBakedTextures() |
320 | { | 320 | { |
321 | SetDefaultTexture(); | 321 | SetDefaultTexture(); |
322 | 322 | ||
323 | //for (int i = 0; i < BAKE_INDICES.Length; i++) | 323 | //for (int i = 0; i < BAKE_INDICES.Length; i++) |
324 | // { | 324 | // { |
325 | // int idx = BAKE_INDICES[i]; | 325 | // int idx = BAKE_INDICES[i]; |
326 | // m_texture.FaceTextures[idx].TextureID = UUID.Zero; | 326 | // m_texture.FaceTextures[idx].TextureID = UUID.Zero; |
327 | // } | 327 | // } |
328 | } | 328 | } |
329 | 329 | ||
330 | protected virtual void SetDefaultTexture() | 330 | protected virtual void SetDefaultTexture() |
331 | { | 331 | { |
332 | m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE)); | 332 | m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE)); |
@@ -371,7 +371,7 @@ namespace OpenSim.Framework | |||
371 | } | 371 | } |
372 | 372 | ||
373 | m_texture = textureEntry; | 373 | m_texture = textureEntry; |
374 | 374 | ||
375 | return changed; | 375 | return changed; |
376 | } | 376 | } |
377 | 377 | ||
@@ -531,14 +531,14 @@ namespace OpenSim.Framework | |||
531 | { | 531 | { |
532 | lock (m_attachments) | 532 | lock (m_attachments) |
533 | { | 533 | { |
534 | List<AvatarAttachment> alist = new List<AvatarAttachment>(); | 534 | List<AvatarAttachment> alist = new List<AvatarAttachment>(); |
535 | foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments) | 535 | foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments) |
536 | { | 536 | { |
537 | foreach (AvatarAttachment attach in kvp.Value) | 537 | foreach (AvatarAttachment attach in kvp.Value) |
538 | alist.Add(new AvatarAttachment(attach)); | 538 | alist.Add(new AvatarAttachment(attach)); |
539 | } | 539 | } |
540 | return alist; | 540 | return alist; |
541 | } | 541 | } |
542 | } | 542 | } |
543 | 543 | ||
544 | internal void AppendAttachment(AvatarAttachment attach) | 544 | internal void AppendAttachment(AvatarAttachment attach) |
@@ -551,7 +551,7 @@ namespace OpenSim.Framework | |||
551 | { | 551 | { |
552 | if (!m_attachments.ContainsKey(attach.AttachPoint)) | 552 | if (!m_attachments.ContainsKey(attach.AttachPoint)) |
553 | m_attachments[attach.AttachPoint] = new List<AvatarAttachment>(); | 553 | m_attachments[attach.AttachPoint] = new List<AvatarAttachment>(); |
554 | 554 | ||
555 | foreach (AvatarAttachment prev in m_attachments[attach.AttachPoint]) | 555 | foreach (AvatarAttachment prev in m_attachments[attach.AttachPoint]) |
556 | { | 556 | { |
557 | if (prev.ItemID == attach.ItemID) | 557 | if (prev.ItemID == attach.ItemID) |
@@ -608,7 +608,7 @@ namespace OpenSim.Framework | |||
608 | m_attachments.Remove(attachpoint); | 608 | m_attachments.Remove(attachpoint); |
609 | return true; | 609 | return true; |
610 | } | 610 | } |
611 | 611 | ||
612 | return false; | 612 | return false; |
613 | } | 613 | } |
614 | 614 | ||
@@ -622,13 +622,13 @@ namespace OpenSim.Framework | |||
622 | if (existingAttachment != null) | 622 | if (existingAttachment != null) |
623 | { | 623 | { |
624 | // m_log.DebugFormat( | 624 | // m_log.DebugFormat( |
625 | // "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}", | 625 | // "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}", |
626 | // existingAttachment.ItemID, existingAttachment.AssetID, existingAttachment.AttachPoint); | 626 | // existingAttachment.ItemID, existingAttachment.AssetID, existingAttachment.AttachPoint); |
627 | 627 | ||
628 | if (existingAttachment.AssetID != UUID.Zero && existingAttachment.AttachPoint == (attachpoint & 0x7F)) | 628 | if (existingAttachment.AssetID != UUID.Zero && existingAttachment.AttachPoint == (attachpoint & 0x7F)) |
629 | { | 629 | { |
630 | m_log.DebugFormat( | 630 | m_log.DebugFormat( |
631 | "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}", | 631 | "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}", |
632 | item, attachpoint); | 632 | item, attachpoint); |
633 | 633 | ||
634 | return false; | 634 | return false; |
@@ -640,7 +640,7 @@ namespace OpenSim.Framework | |||
640 | DetachAttachment(existingAttachment.ItemID); | 640 | DetachAttachment(existingAttachment.ItemID); |
641 | } | 641 | } |
642 | } | 642 | } |
643 | 643 | ||
644 | // check if this is an append or a replace, 0x80 marks it as an append | 644 | // check if this is an append or a replace, 0x80 marks it as an append |
645 | if ((attachpoint & 0x80) > 0) | 645 | if ((attachpoint & 0x80) > 0) |
646 | { | 646 | { |
@@ -701,16 +701,16 @@ namespace OpenSim.Framework | |||
701 | if (index >= 0) | 701 | if (index >= 0) |
702 | { | 702 | { |
703 | // m_log.DebugFormat( | 703 | // m_log.DebugFormat( |
704 | // "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}", | 704 | // "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}", |
705 | // m_attachments[kvp.Key][index].ItemID, index, m_attachments[kvp.Key][index].AttachPoint); | 705 | // m_attachments[kvp.Key][index].ItemID, index, m_attachments[kvp.Key][index].AttachPoint); |
706 | 706 | ||
707 | // Remove it from the list of attachments at that attach point | 707 | // Remove it from the list of attachments at that attach point |
708 | m_attachments[kvp.Key].RemoveAt(index); | 708 | m_attachments[kvp.Key].RemoveAt(index); |
709 | 709 | ||
710 | // And remove the list if there are no more attachments here | 710 | // And remove the list if there are no more attachments here |
711 | if (m_attachments[kvp.Key].Count == 0) | 711 | if (m_attachments[kvp.Key].Count == 0) |
712 | m_attachments.Remove(kvp.Key); | 712 | m_attachments.Remove(kvp.Key); |
713 | 713 | ||
714 | return true; | 714 | return true; |
715 | } | 715 | } |
716 | } | 716 | } |
@@ -867,7 +867,7 @@ namespace OpenSim.Framework | |||
867 | { | 867 | { |
868 | AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]); | 868 | AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]); |
869 | AppendAttachment(att); | 869 | AppendAttachment(att); |
870 | 870 | ||
871 | // m_log.DebugFormat( | 871 | // m_log.DebugFormat( |
872 | // "[AVATAR APPEARANCE]: Unpacked attachment itemID {0}, assetID {1}, point {2}", | 872 | // "[AVATAR APPEARANCE]: Unpacked attachment itemID {0}, assetID {1}, point {2}", |
873 | // att.ItemID, att.AssetID, att.AttachPoint); | 873 | // att.ItemID, att.AssetID, att.AttachPoint); |
@@ -1644,14 +1644,14 @@ namespace OpenSim.Framework | |||
1644 | SHAPE_EYELID_INNER_CORNER_UP = 214, | 1644 | SHAPE_EYELID_INNER_CORNER_UP = 214, |
1645 | SKIRT_SKIRT_RED = 215, | 1645 | SKIRT_SKIRT_RED = 215, |
1646 | SKIRT_SKIRT_GREEN = 216, | 1646 | SKIRT_SKIRT_GREEN = 216, |
1647 | SKIRT_SKIRT_BLUE = 217, | 1647 | SKIRT_SKIRT_BLUE = 217, |
1648 | 1648 | ||
1649 | /// <summary> | 1649 | /// <summary> |
1650 | /// Avatar Physics section. These are 0 type visual params which get transmitted. | 1650 | /// Avatar Physics section. These are 0 type visual params which get transmitted. |
1651 | /// </summary> | 1651 | /// </summary> |
1652 | 1652 | ||
1653 | /// <summary> | 1653 | /// <summary> |
1654 | /// Breast Part 1 | 1654 | /// Breast Part 1 |
1655 | /// </summary> | 1655 | /// </summary> |
1656 | BREAST_PHYSICS_MASS = 218, | 1656 | BREAST_PHYSICS_MASS = 218, |
1657 | BREAST_PHYSICS_GRAVITY = 219, | 1657 | BREAST_PHYSICS_GRAVITY = 219, |
@@ -1697,7 +1697,7 @@ namespace OpenSim.Framework | |||
1697 | BREAST_PHYSICS_LEFTRIGHT_GAIN = 249, | 1697 | BREAST_PHYSICS_LEFTRIGHT_GAIN = 249, |
1698 | BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250, | 1698 | BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250, |
1699 | 1699 | ||
1700 | // Ubit: 07/96/2013 new parameters | 1700 | // Ubit: 07/96/2013 new parameters |
1701 | _APPEARANCEMESSAGE_VERSION = 251, //ID 11000 | 1701 | _APPEARANCEMESSAGE_VERSION = 251, //ID 11000 |
1702 | 1702 | ||
1703 | SHAPE_HOVER = 252, //ID 11001 | 1703 | SHAPE_HOVER = 252, //ID 11001 |