ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into avinationmerge

Browse Source 
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
This commit is contained in:
Melanie Thielker
2015-11-16 15:28:51 +01:00
parent 53e0cd5534 bcb27d4406
commit f93ce485b1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -490,7 +490,14 @@ namespace OpenSim.Framework
m_wearables[i] = new AvatarWearable();
}
m_wearables[wearableId].Clear();
<<<<<<< HEAD
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);
}