diff options
| author | Melanie Thielker | 2015-11-16 15:28:51 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2015-11-16 15:28:51 +0100 |
| commit | f93ce485b1df8c1c8a7ff1a44b280ce30b8707b9 (patch) | |
| tree | f047a5e4f8907d21b06a200291aa47f5c4fe2a4a /OpenSim | |
| parent | handle diferente number of wearables on getting assets form another appearance (diff) | |
| parent | fix the protection for more Wearables than region suports (diff) | |
| download | opensim-SC_OLD-0.9.0.zip opensim-SC_OLD-0.9.0.tar.gz opensim-SC_OLD-0.9.0.tar.bz2 opensim-SC_OLD-0.9.0.tar.xz | |
Merge branch 'master' into avinationmerge0.9.0
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 07c739d..79a66ab 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
| @@ -490,7 +490,14 @@ namespace OpenSim.Framework | |||
| 490 | m_wearables[i] = new AvatarWearable(); | 490 | m_wearables[i] = new AvatarWearable(); |
| 491 | } | 491 | } |
| 492 | m_wearables[wearableId].Clear(); | 492 | m_wearables[wearableId].Clear(); |
| 493 | <<<<<<< HEAD | ||
| 493 | for (int i = 0; i < wearable.Count; i++) | 494 | for (int i = 0; i < wearable.Count; i++) |
| 495 | ======= | ||
| 496 | int count = wearable.Count; | ||
| 497 | if (count > AvatarWearable.MAX_WEARABLES) | ||
| 498 | count = AvatarWearable.MAX_WEARABLES; | ||
| 499 | for (int i = 0; i < count; i++) | ||
| 500 | >>>>>>> master | ||
| 494 | m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); | 501 | m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); |
| 495 | } | 502 | } |
| 496 | 503 | ||