diff options
author | Melanie Thielker | 2015-11-01 19:37:14 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-11-01 19:37:14 +0100 |
commit | 5f18f2ce6a4308fe30de8b7816058bd5d4b962ca (patch) | |
tree | b41362f4ea4942110f6ccb5260dc3e2697d20686 /OpenSim/Framework/AvatarAppearance.cs | |
parent | More plumbing of the EntityTransferContext (not yet complete) (diff) | |
download | opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.zip opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.gz opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.bz2 opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.xz |
More EntityTransferContext plumbing
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 50746a0..5258760 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -717,7 +717,7 @@ namespace OpenSim.Framework | |||
717 | /// <summary> | 717 | /// <summary> |
718 | /// Create an OSDMap from the appearance data | 718 | /// Create an OSDMap from the appearance data |
719 | /// </summary> | 719 | /// </summary> |
720 | public OSDMap Pack(int wearablesCount) | 720 | public OSDMap Pack(EntityTransferContext ctx) |
721 | { | 721 | { |
722 | OSDMap data = new OSDMap(); | 722 | OSDMap data = new OSDMap(); |
723 | 723 | ||
@@ -728,8 +728,8 @@ namespace OpenSim.Framework | |||
728 | // | 728 | // |
729 | // This will send as many or as few wearables as we have, unless a count | 729 | // This will send as many or as few wearables as we have, unless a count |
730 | // is given. Used for legacy (pre 0.4) versions. | 730 | // is given. Used for legacy (pre 0.4) versions. |
731 | int count = wearablesCount; | 731 | int count = ctx.WearablesCount; |
732 | if (wearablesCount == -1) | 732 | if (ctx.WearablesCount == -1) |
733 | count = m_wearables.Length; | 733 | count = m_wearables.Length; |
734 | OSDArray wears = new OSDArray(count); | 734 | OSDArray wears = new OSDArray(count); |
735 | for (int i = 0; i < count; i++) | 735 | for (int i = 0; i < count; i++) |