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

1
indra/newview/llinventorymodel.cpp
View File

@@ -3486,7 +3486,6 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* ite
switch(item->getType()) switch(item->getType())
{ {
{
// <edit> I don't even think changing this did anything // <edit> I don't even think changing this did anything
//case LLAssetType::AT_CALLINGCARD: //case LLAssetType::AT_CALLINGCARD:
// // not allowed // // not allowed

5
indra/newview/llvoavatar.cpp
View File

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

7
indra/newview/llvoavatar.h
View File

@@ -504,6 +504,9 @@ public:
typedef std::map<S32, LLViewerJointAttachment*> attachment_map_t; typedef std::map<S32, LLViewerJointAttachment*> attachment_map_t;
attachment_map_t mAttachmentPoints; attachment_map_t mAttachmentPoints;
std::vector<LLPointer<LLViewerObject> > mPendingAttachment; std::vector<LLPointer<LLViewerObject> > mPendingAttachment;
// <edit>
std::map<S32, LLUUID> mUnsupportedAttachmentPoints;
// </edit>
//-------------------------------------------------------------------- //--------------------------------------------------------------------
// static preferences that are controlled by user settings/menus // static preferences that are controlled by user settings/menus
@@ -581,10 +584,6 @@ private:
const static LLUUID sStepSounds[LL_MCODE_END]; const static LLUUID sStepSounds[LL_MCODE_END];
const static LLUUID sStepSoundOnLand; const static LLUUID sStepSoundOnLand;
// <edit>
std::map<S32, LLUUID> mUnsupportedAttachmentPoints;
// </edit>
// Xml parse tree of avatar config file // Xml parse tree of avatar config file
static LLXmlTree sXMLTree; static LLXmlTree sXMLTree;
// Xml parse tree of avatar skeleton file // Xml parse tree of avatar skeleton file