diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a1c020ac649ba723e4d061aa78df474cc92c4af8..5b1444ac6bc0c054de63405d12a1b92b2cf8ac85 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -471,17 +471,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>AISCommandFilterMask</key>
-    <map>
-      <key>Comment</key>
-      <string>AIS command filter (death by Kitty if you change this)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <integer>65247</integer>
-    </map>
     <key>AlertedUnsupportedHardware</key>
     <map>
       <key>Comment</key>
@@ -12701,7 +12690,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <boolean>1</boolean>
+      <integer>1</integer>
     </map>
     <key>NearbyListShowIcons</key>
     <map>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl
index 20e635c6e780b4216f1db72ca6d6771a76283def..7cdddfe8db428c64d6ccf75d478cde666ea2f592 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl
@@ -39,10 +39,6 @@ uniform mat4 modelview_projection_matrix;
 
 #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND)
 
-// forwards
-void setAtmosAttenuation(vec3 c);
-void setAdditiveColor(vec3 c);
-
 #if !defined(HAS_SKIN)
 uniform mat4 modelview_matrix;
 #endif
@@ -138,9 +134,6 @@ void main()
 	vertex_color = diffuse_color;
 
 #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND)
-    // appease OSX GLSL compiler/linker by touching all the varyings we said we would
-    setAtmosAttenuation(vec3(1));
-    setAdditiveColor(vec3(0));
 #if !defined(HAS_SKIN)
 	vary_position = (modelview_matrix*vec4(position.xyz, 1.0)).xyz;
 #endif
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 736fbc19e26fd34ea38505fe56df41ac7227d15f..25d55e676a315f5faa29d896f231e8d625bae8c6 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -306,7 +306,6 @@ RenderShadowDetail			0	0
 RenderReflectionProbeDetail	0	-1
 
 list Intel
-RenderAnisotropicLevel			1	0
 RenderFSAASamples			1	0
 RenderGLContextCoreProfile  1   0
 RenderGLMultiThreadedMedia  1   0
diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
index 584d3bfc241a4adf076c79c810539e1ac636428e..9578fa53b1fcaae1b3f78f2d580db31ae886cdda 100644
--- a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
+++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
@@ -67,13 +67,6 @@ BOOL LLFloaterPreferenceGraphicsAdvanced::postBuild()
     // sets this when 8x and 16x are indeed available
     //
 #if !LL_DARWIN
-    if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)
-    { //remove FSAA settings above "4x"
-        LLComboBox* combo = getChild<LLComboBox>("fsaa");
-        combo->remove("8x");
-        combo->remove("16x");
-    }
-
     LLCheckBoxCtrl *use_HiDPI = getChild<LLCheckBoxCtrl>("use HiDPI");
     use_HiDPI->setVisible(FALSE);
 #endif
diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp
index 3eaca1969f8a332799032cdfa086cff81d7f0177..129edb8b01c97041c692264f9db2754d026a0a7d 100644
--- a/indra/newview/llviewerpartsource.cpp
+++ b/indra/newview/llviewerpartsource.cpp
@@ -305,9 +305,6 @@ void LLViewerPartSourceScript::update(const F32 dt)
 				continue;
 			}
 
-			if (mPartSysData.mPartData.mFlags & LLPartData::LL_PART_RIBBON_MASK && mLastPart && (mLastPart->mPosAgent-mPosAgent).magVec() <= .005f)
-				continue; //Skip if parent isn't far enough away.
-
 			LLViewerPart* part = new LLViewerPart();
 
 			part->init(this, mImagep, NULL);
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index 4e1fe28d0bf6873e58606a651208b85e9401e74d..1bf38fdd6908ec50e0f29cfcfc76d6b9fa8b22e9 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -259,7 +259,6 @@ extern LLGLSLShader			gHUDFullbrightAlphaMaskAlphaProgram;
 extern LLGLSLShader			gDeferredEmissiveProgram;
 extern LLGLSLShader			gDeferredAvatarEyesProgram;
 extern LLGLSLShader			gDeferredAvatarAlphaProgram;
-//extern LLGLSLShader			gDeferredAvatarAlphaWaterProgram;
 extern LLGLSLShader			gDeferredWLSkyProgram;
 extern LLGLSLShader			gDeferredWLCloudProgram;
 extern LLGLSLShader			gDeferredWLSunProgram;
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 41b6a2dc50146cefeaafe656daf895b10d6c77ab..f036b43f122efd4782855ac35479431a0baefe40 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -167,7 +167,7 @@
             <icon
              follows="top|left"
              height="16"
-             image_name="unknown"
+             image_name="Unknown_Icon"
              layout="topleft"
              left="10"
              name="maturity_icon"