diff --git a/indra/newview/alcontrolcache.cpp b/indra/newview/alcontrolcache.cpp
index 1bc4c35a0913acbcb055ed5183caf517a35363e2..f07ea55c93892694a7b14c33b6d5ecd33ca3f8be 100644
--- a/indra/newview/alcontrolcache.cpp
+++ b/indra/newview/alcontrolcache.cpp
@@ -28,7 +28,6 @@ S32  ALControlCache::ToastGap;
 F32  ALControlCache::YawFromMousePosition = 90.f;
 F32  ALControlCache::PitchFromMousePosition = 90.f;
 U32  ALControlCache::RenderToneMapType = 0;
-F32  ALControlCache::RenderToneMapExposure = 1.f;
 
 
 #define DECLARE_CTRL(ctrl, type, ctrl_type) \
@@ -84,5 +83,4 @@ void ALControlCache::initControls()
     DECLARE_CTRL_F32(PitchFromMousePosition);
 
 	DECLARE_CTRL_U32(RenderToneMapType);
-	DECLARE_CTRL_F32(RenderToneMapExposure);
 }
diff --git a/indra/newview/alcontrolcache.h b/indra/newview/alcontrolcache.h
index a53b138cf01e344e8ac12afaf07468ebe4cbfa70..a5c4715f1a6fbfb5d3fc560d66dd9f0448f6e74c 100644
--- a/indra/newview/alcontrolcache.h
+++ b/indra/newview/alcontrolcache.h
@@ -30,7 +30,6 @@ struct ALControlCache
     static F32		YawFromMousePosition;
     static F32      PitchFromMousePosition;
 	static U32		RenderToneMapType;
-	static F32		RenderToneMapExposure;
 };
 
 #endif
\ No newline at end of file
diff --git a/indra/newview/alfloaterlightbox.cpp b/indra/newview/alfloaterlightbox.cpp
index b13e098ae9f28f31248a289671e6774f947399af..13636e98fb1149de1eec2306befae108ba65056c 100644
--- a/indra/newview/alfloaterlightbox.cpp
+++ b/indra/newview/alfloaterlightbox.cpp
@@ -102,7 +102,7 @@ void ALFloaterLightBox::onClickResetGroupDefault(const LLSD& userdata)
 		{
 			controlp->resetToDefault(true);
 		}
-		controlp = gSavedSettings.getControl("RenderToneMapExposure");
+		controlp = gSavedSettings.getControl("RenderExposure");
 		if (controlp)
 		{
 			controlp->resetToDefault(true);
diff --git a/indra/newview/alrenderutils.cpp b/indra/newview/alrenderutils.cpp
index 8f893b9850728fff5fe57aad70b37118e616bb6c..b5de79ae0794b9667d55cf4dd2cb02b589a7cbb0 100644
--- a/indra/newview/alrenderutils.cpp
+++ b/indra/newview/alrenderutils.cpp
@@ -247,7 +247,7 @@ ALRenderUtil::ALRenderUtil()
 	// Connect settings
 	gSavedSettings.getControl("RenderColorGradeLUT")->getSignal()->connect(boost::bind(&ALRenderUtil::setupColorGrade, this));
 	gSavedSettings.getControl("RenderToneMapType")->getSignal()->connect(boost::bind(&ALRenderUtil::setupTonemap, this));
-	gSavedSettings.getControl("RenderToneMapExposure")->getSignal()->connect(boost::bind(&ALRenderUtil::setupTonemap, this));
+	gSavedSettings.getControl("RenderExposure")->getSignal()->connect(boost::bind(&ALRenderUtil::setupTonemap, this));
 	gSavedSettings.getControl("RenderToneMapLottesA")->getSignal()->connect(boost::bind(&ALRenderUtil::setupTonemap, this));
 	gSavedSettings.getControl("RenderToneMapLottesB")->getSignal()->connect(boost::bind(&ALRenderUtil::setupTonemap, this));
 	gSavedSettings.getControl("RenderToneMapUchimuraA")->getSignal()->connect(boost::bind(&ALRenderUtil::setupTonemap, this));
@@ -310,7 +310,7 @@ bool ALRenderUtil::setupTonemap()
 			mTonemapType = ALTonemap::TONEMAP_NONE;
 		}
 
-		mTonemapExposure = llclamp(gSavedSettings.getF32("RenderToneMapExposure"), 0.1f, 16.f);
+		mTonemapExposure = llclamp(gSavedSettings.getF32("RenderExposure"), 0.5f, 4.f);
 
 		mToneLottesParamA = gSavedSettings.getVector3("RenderToneMapLottesA");
 		mToneLottesParamB = gSavedSettings.getVector3("RenderToneMapLottesB");
diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml
index 78b6fb68618bfef0e566f46593bdc8735b3554db..0d34fd025e844560da88d1578813acf50644fd9c 100644
--- a/indra/newview/app_settings/settings_alchemy.xml
+++ b/indra/newview/app_settings/settings_alchemy.xml
@@ -1179,7 +1179,7 @@
     <key>RenderToneMapExposure</key>
     <map>
       <key>Comment</key>
-      <string>Tonemapping exposure multiplier</string>
+      <string>[OBSOLETE]</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index bbed3a2cd8a72c33b53031d100609bb873639523..df7e31b5bb4f053ebff5f92d232e7cbd11f2c419 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -320,7 +320,7 @@ void LLPresetsManager::getGraphicsControlNames(std::vector<std::string>& names)
 		"RenderShadowDetail",
 		"RenderTerrainDetail",
 		"RenderTerrainLODFactor",
-		"RenderToneMapExposure",
+		"RenderExposure",
 		"RenderToneMapType",
 		"RenderTransparentWater",
 		"RenderTreeLODFactor",
diff --git a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
index cf297a511a7cc3583bd0c1c29523058675df2160..4a5cd786be81d924a316de020861bc8fcdd401d5 100644
--- a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
@@ -381,13 +381,13 @@
 					increment=".1"
 					follows="left|top|right"
 					layout="topleft"
-					max_val="16.0"
-					min_val="0.1"
+					max_val="4.0"
+					min_val="0.5"
 					left_delta="100"
 					right="-55"
 					name="exposure_slider"
 					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
-					control_name="RenderToneMapExposure"/>
+					control_name="RenderExposure"/>
 				<spinner
 					top_pad="-20"
 					height="15"
@@ -396,13 +396,13 @@
 					decimal_digits="1"
 					follows="top|right"
 					layout="topleft"
-					max_val="16.0"
-					min_val="0.1"
+					max_val="4.0"
+					min_val="0.5"
 					width="55"
 					increment=".1"
 					name="exposure_spinner"
 					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
-					control_name="RenderToneMapExposure"/>
+					control_name="RenderExposure"/>
 				<text
 					visible="false"
 					name="tonemapper_dynamic_text1"