diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index d90ed5a75..33a184077 100755
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<?xml version="1.0" encoding="us-ascii" standalone="yes"?>
 <linden_avatar
  version="1.0"
  wearable_definition_version="22">  
@@ -6609,7 +6609,7 @@
     <layer
        name="head_tattoo">
         <texture
-        local_texture="head_tattoo" />
+			local_texture="head_tattoo" />
 		<param id="1062" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
 			name="tattoo_head_red" value_min="0" value_max="1" value_default="1">
 			<param_color>
@@ -6634,7 +6634,7 @@
 			</param_color>
 		</param>
     </layer>
-   </layer_set>
+</layer_set>
 
 <!-- =========================================================== -->
    <layer_set
diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 50cb1294d..b39e69c22 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -455,8 +455,7 @@ BOOL LLPanelEditWearable::postBuild()
 										 "inv_item_skin.tga" );*/
 	std::string icon_name = get_item_icon_name(asset_type,LLInventoryType::IT_WEARABLE,mType,FALSE);
 
- 									childSetValue("icon", icon_name);
-									childSetValue("icon", icon_name);
+	childSetValue("icon", icon_name);
 
 	childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this );
 
diff --git a/indra/newview/llfloatervfs.cpp b/indra/newview/llfloatervfs.cpp
index ccebb4c44..e0b3f1b63 100644
--- a/indra/newview/llfloatervfs.cpp
+++ b/indra/newview/llfloatervfs.cpp
@@ -303,10 +303,10 @@ void LLFloaterVFS::onClickAdd(void* user_data)
 		file.mType = asset_type;
 		file.mName = gDirUtilp->getBaseFileName(file_name, true);
 		floaterp->add(file);
-		if(floaterp->getChild<LLCheckBoxCtrl>("create_pretend_item")->get())
+		/*if(floaterp->getChild<LLCheckBoxCtrl>("create_pretend_item")->get())
 		{
 			LLLocalInventory::addItem(file.mName, (int)file.mType, file.mID, true);
-		}
+		}*/
 	}
 }
 // static
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index e789a3b7b..8f9226a8f 100755
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -129,41 +129,6 @@ public:
 	}
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLInventoryPanelObserver
 //
diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h
index a51406bc1..c245c0e8d 100644
--- a/indra/newview/llpreviewgesture.h
+++ b/indra/newview/llpreviewgesture.h
@@ -168,7 +168,6 @@ protected:
 
 	LLCheckBoxCtrl*		mActiveCheck;
 	LLButton*			mSaveBtn;
-
 	LLButton*			mPreviewBtn;
 
 	LLMultiGesture*		mPreviewGesture;
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index a18d7d989..9deaa58dd 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1480,7 +1480,7 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
 			return TRUE;
 		}
 	}
-
+	else
 	{
 		return FALSE;
 	}
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index d0e0f1b7c..8fcbb88b1 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -329,15 +329,16 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 		gMenuHolder->setParcelSelection(selection);
 		gPieLand->show(x, y, mPieMouseButtonDown);
 
+		// <edit>
 		if(!gSavedSettings.getBOOL("DisablePointAtAndBeam"))
 		{
-		// </edit>
-		// VEFFECT: ShowPie
+			// </edit>
+			// VEFFECT: ShowPie
 			LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
 			effectp->setPositionGlobal(mPick.mPosGlobal);
 			effectp->setColor(LLColor4U(gAgent.getEffectColor()));
 			effectp->setDuration(0.25f);
-		// <edit>
+			// <edit>
 		}
 		// </edit>
 	}
@@ -407,6 +408,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 			
 			gPieObject->show(x, y, mPieMouseButtonDown);
 
+			// <edit>
 			if(!gSavedSettings.getBOOL("DisablePointAtAndBeam"))
 			{
 				// </edit>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 94a5bb653..c53402a37 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -9156,7 +9156,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 						
 				if( !param )
 				{
-					llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl;
+					llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Too few)." << llendl;
 					return;
 				}
 
@@ -9206,7 +9206,10 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 		}
 		if( param )
 		{
-			llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl;
+			if (param->getName() == "tattoo_red")
+				llinfos << "No tattoo tinting for " << getFullname() << "." << llendl;
+			else
+				llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl;
 			return;
 		}