diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-08-21 14:18:35 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-08-21 14:18:35 -0400 |
| commit | 892f99af3b51ea08e6e77d5945e6e9ca24d4223d (patch) | |
| tree | da6af2c378d5abda0a4bc625787990ad1eb89479 /indra/newview | |
| parent | 1fa233e35e25cdf98b604caa88fb4b8ef9727383 (diff) | |
MAINT-4158 WIP - fix for bug caused by multiple wearables with the same asset id
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llagentwearables.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 890fc9a8d9..215699dcc9 100755 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1009,6 +1009,10 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it continue; } + // Don't care about this case - ordering of wearables with the same asset id has no effect. + // Causes the two-alphas error case in MAINT-4158. + // We should actually disallow wearing two wearables with the same asset id. +#if 0 if (curr_wearable->getName() != new_item->getName() || curr_wearable->getItemID() != new_item->getUUID()) { @@ -1019,6 +1023,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it mismatched++; continue; } +#endif // If we got here, everything matches. matched++; } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 509de74ac3..e5473e92d9 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5625,7 +5625,7 @@ const LLViewerJointAttachment *LLVOAvatar::attachObject(LLViewerObject *viewer_o } //----------------------------------------------------------------------------- -// attachObject() +// getNumAttachments() //----------------------------------------------------------------------------- U32 LLVOAvatar::getNumAttachments() const { |