diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index fd6bcca05..81a787967 100644
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -77,6 +77,7 @@ void LLFloaterHardwareSettings::refresh()
 	LLPanel::refresh();
 
 	mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
+	mUseFBO = gSavedSettings.getBOOL("RenderUseFBO");
 	mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
 	mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
 	mGamma = gSavedSettings.getF32("RenderGamma");
@@ -106,7 +107,8 @@ void LLFloaterHardwareSettings::refreshEnabledState()
 	{
 		childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
 	}
-		
+
+	childSetEnabled("fbo",gGLManager.mHasFramebufferObject);
 
 	// if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
 	childSetEnabled("gamma", !gPipeline.canUseWindLightShaders());
@@ -192,6 +194,7 @@ void LLFloaterHardwareSettings::apply()
 void LLFloaterHardwareSettings::cancel()
 {
 	gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
+	gSavedSettings.setBOOL("RenderUseFBO", mUseFBO);
 	gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
 	gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
 	gSavedSettings.setF32("RenderGamma", mGamma);
diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
index 04a33f69d..bdf3fb13b 100644
--- a/indra/newview/llfloaterhardwaresettings.h
+++ b/indra/newview/llfloaterhardwaresettings.h
@@ -88,6 +88,7 @@ protected:
 	LLSliderCtrl*	mCtrlVideoCardMem;
 
 	BOOL mUseVBO;
+	BOOL mUseFBO;
 	BOOL mUseAniso;
 	U32 mFSAASamples;
 	F32 mGamma;
diff --git a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index aab647014..21ba6b168 100644
--- a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -69,6 +69,19 @@
 		mouse_opaque="true" name="vbo_stream" radio_style="false"
 		tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."
 		width="315" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+  font="SansSerifSmall" h_pad="0" halign="left" height="12"
+  left="10" mouse_opaque="true" name="Enable FBO:" v_pad="0"
+  width="140">
+    Enable Framebuffer Objects:
+  </text>
+  <check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="false" follows="left|top"
+		font="SansSerifSmall" height="16" initial_value="true"
+		label="Enable OpenGL Frame Buffer Objects" left="148"
+		mouse_opaque="true" name="fbo" radio_style="false"
+		tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."
+		width="315" />
 	<slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" 
 		decimal_digits="0" enabled="true"
 		follows="left|top" height="16" increment="16"