Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing some more merge errors

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-22 00:11:47 -03:00
parent a9803a0f96
commit 9dbe415796
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llvoavatar.cpp
View File

@@ -6476,10 +6476,15 @@ BOOL LLVOAvatar::isWearingAttachment( const LLUUID& inv_item_id )
BOOL LLVOAvatar::isWearingUnsupportedAttachment( const LLUUID& inv_item_id )
{
std::map<S32, LLUUID>::iterator end = mUnsupportedAttachmentPoints.end();
for(std::map<S32, LLUUID>::iterator iter = mUnsupportedAttachmentPoints.begin(); iter != end; ++iter)
if((*iter).second == inv_item_id)
return TRUE;
return FALSE;
for(std::map<S32, LLUUID>::iterator iter = mUnsupportedAttachmentPoints.begin(); iter != end; ++iter)
{
if((*iter).second == inv_item_id)
{
return TRUE;
}
}
return FALSE;
}
//-----------------------------------------------------------------------------
// getWornAttachment()
//-----------------------------------------------------------------------------