fixing some more merge errors

indra/newview/llinventorymodel.cpp

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

indra/newview/llvoavatar.cpp

@@ -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()
 //-----------------------------------------------------------------------------

indra/newview/llvoavatar.h

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