Fix build after merge, bugs remaining though

indra/newview/llinventoryfilter.cpp

@@ -47,6 +47,8 @@
 #include "llclipboard.h"
 #include "lltrans.h"
 
+#include <boost/tokenizer.hpp>
+
 LLTrace::BlockTimerStatHandle FT_FILTER_CLIPBOARD("Filter Clipboard");
 
 LLInventoryFilter::FilterOps::FilterOps(const Params& p)

indra/newview/llsidepaneliteminfo.cpp

@@ -789,7 +789,7 @@ void LLSidepanelItemInfo::setPropertiesFieldsEnabled(bool enabled)
 {
     for(auto const& item : property_fields)
     {
-        getChildView(fields[t])->setEnabled(false);
+        getChildView(item)->setEnabled(false);
     }
 }
 

indra/newview/llsidepaneltaskinfo.cpp

@@ -1033,11 +1033,7 @@ void LLSidepanelTaskInfo::onCommitPerm(BOOL enabled, U8 field, U32 perm)
 
 	LLSelectMgr::getInstance()->selectionSetObjectPermissions(field, enabled, perm);
 
-    LLSidepanelTaskInfo* self = (LLSidepanelTaskInfo*)data;
-    if (self)
-    {
-        self->disablePermissions();
-    }
+	disablePermissions();
 }
 
 void LLSidepanelTaskInfo::onCommitGroupShare(const LLSD& user_data)

indra/newview/lltexturecache.cpp

@@ -850,7 +850,7 @@ LLTextureCache::LLTextureCache(bool threaded)
 	  mTexturesSizeTotal(0),
 	  mDoPurge(false)
 {
-    mHeaderAPRFilePoolp = new LLVolatileAPRPool(); // is_local = true, because this pool is for headers, headers are under own mutex
+    mHeaderAPRFilePoolp = new LLVolatileAPRPool("Texture Cache Header"); // is_local = true, because this pool is for headers, headers are under own mutex
 }
 
 LLTextureCache::~LLTextureCache()

indra/newview/llviewermenu.cpp

@@ -7609,9 +7609,9 @@ void handle_dump_attachments(void*)
 		LLVOAvatar::attachment_map_t::iterator curiter = iter++;
 		LLViewerJointAttachment* attachment = curiter->second;
 		S32 key = curiter->first;
-		for (const auto& attached_object : attachment->mAttachedObjects)
+		for (auto& attached_object : attachment->mAttachedObjects)
         {
-            BOOL visible = (attached_object != NULL &&
+            BOOL visible = (attached_object.notNull() &&
 							attached_object->mDrawable.notNull() && 
 							!attached_object->mDrawable->isRenderType(0));
 			LLVector3 pos;

indra/newview/llviewerwindow.h

@@ -192,7 +192,7 @@ public:
 	/*virtual*/ BOOL handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask) override;
 	/*virtual*/ BOOL handleOtherMouseDown(LLWindow *window, LLCoordGL pos, MASK mask, S32 button) override;
 	/*virtual*/ BOOL handleOtherMouseUp(LLWindow *window, LLCoordGL pos, MASK mask, S32 button) override;
-	/*virtual*/ BOOL handleOtherMouse(LLWindow *window, LLCoordGL pos, MASK mask, S32 button, bool down) override;
+	BOOL handleOtherMouse(LLWindow *window, LLCoordGL pos, MASK mask, S32 button, bool down);
 	/*virtual*/ LLWindowCallbacks::DragNDropResult handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, LLWindowCallbacks::DragNDropAction action, std::string data) override;
     /*virtual*/ void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask) override;
 	/*virtual*/ void handleMouseLeave(LLWindow *window) override;

indra/newview/llvoavatar.cpp

@@ -1405,7 +1405,7 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
 
 		if (attachment->getValid())
 		{
-			for (const auto& attached_object : attachment->mAttachedObjects)
+			for (auto& attached_object : attachment->mAttachedObjects)
 			{
                     // Don't we need to look at children of attached_object as well?
 				if (attached_object && !attached_object->isHUDAttachment())
@@ -1881,7 +1881,7 @@ LLViewerObject* LLVOAvatar::lineSegmentIntersectRiggedAttachments(const LLVector
 		{
 			LLViewerJointAttachment* attachment = attach_pair.second;
 
-			for(const auto& attached_object : attachment->mAttachedObjects)
+			for(auto& attached_object : attachment->mAttachedObjects)
 			{
 					
 				if (attached_object->lineSegmentIntersect(start, local_end, face, pick_transparent, pick_rigged, face_hit, &local_intersection, tex_coord, normal, tangent))
@@ -2695,7 +2695,7 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
 		{
 			LLViewerJointAttachment* attachment = attach_pair.second;
 
-			for(const auto& attached_object : attachment->mAttachedObjects)
+			for(auto& attached_object : attachment->mAttachedObjects)
 			{
 				BOOL visibleAttachment = visible || (attached_object && 
 													 !(attached_object->mDrawable->getSpatialBridge() &&
@@ -8431,7 +8431,7 @@ void LLVOAvatar::updateMeshTextures()
     {
 		LLViewerJointAttachment* attachment = attachment_point.second;
 
-		for (const auto& attached_object : attachment->mAttachedObjects)
+		for (auto& attached_object : attachment->mAttachedObjects)
         {
             if (attached_object && !attached_object->isDead())
 			{
@@ -10049,7 +10049,7 @@ void LLVOAvatar::getAssociatedVolumes(std::vector<LLVOVolume*>& volumes)
 {
 	for ( const auto& pair : mAttachmentPoints)
 	{
-		for(const auto& attached_object : pair.second->mAttachedObjects)
+		for(auto& attached_object : pair.second->mAttachedObjects)
 		{
 			if (!attached_object)
 				continue;

indra/newview/pipeline.cpp

@@ -10117,7 +10117,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
 		for (const auto& attach_pair : avatar->mAttachmentPoints)
 		{
-			for (const auto& attached_object : attach_pair.second->mAttachedObjects)
+			for (auto& attached_object : attach_pair.second->mAttachedObjects)
 			{
 				if (attached_object)
 				{