OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a merge conflict

avinationmerge
Melanie Thielker 2015-11-16 15:30:39 +01:00
parent f93ce485b1
commit b2592ab132
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/AvatarAppearance.cs
View File

@ -490,14 +490,7 @@ namespace OpenSim.Framework
m_wearables[i] = new AvatarWearable(); m_wearables[i] = new AvatarWearable();
} }
m_wearables[wearableId].Clear(); m_wearables[wearableId].Clear();
<<<<<<< HEAD
for (int i = 0; i < wearable.Count; i++) for (int i = 0; i < wearable.Count; i++)
=======
int count = wearable.Count;
if (count > AvatarWearable.MAX_WEARABLES)
count = AvatarWearable.MAX_WEARABLES;
for (int i = 0; i < count; i++)
>>>>>>> master
m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
} }