aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs7
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