diff --git a/indra/newview/llfloaterenvironmentadjust.cpp b/indra/newview/llfloaterenvironmentadjust.cpp
index 6773e2dcaf61a09c46510b1464a8f5ff8aba276c..2c646799ffc221ab296b5c9dc9b9ff02178a0f38 100644
--- a/indra/newview/llfloaterenvironmentadjust.cpp
+++ b/indra/newview/llfloaterenvironmentadjust.cpp
@@ -28,6 +28,7 @@
 
 #include "llfloaterenvironmentadjust.h"
 
+#include "llnotificationsutil.h"
 #include "llslider.h"
 #include "llsliderctrl.h"
 #include "llcolorswatch.h"
@@ -53,6 +54,7 @@ namespace
     const std::string FIELD_SKY_GLOW_SIZE("glow_size");
     const std::string FIELD_SKY_STAR_BRIGHTNESS("star_brightness");
     const std::string FIELD_SKY_MOON_ROTATION("moon_rotation");
+    const std::string BTN_RESET("btn_reset");
 
     const F32 SLIDER_SCALE_SUN_AMBIENT(3.0f);
     const F32 SLIDER_SCALE_BLUE_HORIZON_DENSITY(2.0f);
@@ -93,6 +95,7 @@ BOOL LLFloaterEnvironmentAdjust::postBuild()
     getChild<LLUICtrl>(FIELD_SKY_SUN_SCALE)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onSunScaleChanged(); });
 
     getChild<LLUICtrl>(FIELD_SKY_MOON_ROTATION)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonRotationChanged(); });
+    getChild<LLUICtrl>(BTN_RESET)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onButtonReset(); });
 
     refresh();
     return TRUE;
@@ -184,6 +187,22 @@ void LLFloaterEnvironmentAdjust::captureCurrentEnvironment()
 
 }
 
+void LLFloaterEnvironmentAdjust::onButtonReset()
+{
+    LLNotificationsUtil::add("PersonalSettingsConfirmReset", LLSD(), LLSD(),
+        [this](const LLSD&notif, const LLSD&resp)
+    {
+        S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp);
+        if (opt == 0)
+        {
+            this->closeFloater();
+            LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_LOCAL);
+            LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
+            LLEnvironment::instance().updateEnvironment();
+        }
+    }); 
+
+}
 //-------------------------------------------------------------------------
 void LLFloaterEnvironmentAdjust::onAmbientLightChanged()
 {
diff --git a/indra/newview/llfloaterenvironmentadjust.h b/indra/newview/llfloaterenvironmentadjust.h
index 5bd91b0c436f204419efaf971164b9000084e22b..4876c45065f2c1930a6cb1fa91c59d6aa41de5c0 100644
--- a/indra/newview/llfloaterenvironmentadjust.h
+++ b/indra/newview/llfloaterenvironmentadjust.h
@@ -77,6 +77,8 @@ class LLFloaterEnvironmentAdjust : public LLFloater
 
     void                        onMoonRotationChanged();
 
+    void                        onButtonReset();
+
     void                        onEnvironmentUpdated(LLEnvironment::EnvSelection_t env, S32 version);
 
     LLSettingsSky::ptr_t        mLiveSky;
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index e2cf809c9c80bca9252f223aab8a2f5340b0c4ea..fc356c10c72752ab590410a286d89dfb83147648 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -5,14 +5,14 @@
          save_rect="false"
          title="Personal Lighting"
          width="845"
-         height="225"
+         height="230"
          min_width="500"
          min_height="225"
          single_instance="true"
          can_resize="false">
     <layout_stack name="outer_stack"
                   width="845"
-                  height="212"
+                  height="220"
                   follows="all"
                   animate="false"
                   top="0"
@@ -84,6 +84,16 @@
                                   name="blue_density"
                                   top_pad="5"
                                   width="60"/>
+                    <button
+                      follows="left|top"
+                      height="23"
+                      label="Reset"
+                      tool_tip="Close and reset to Shared Environment"
+                      layout="topleft"
+                      name="btn_reset"
+                      left_delta="-2"
+                      top_pad="10"
+                      width="100"/>
                     <text follows="right|top"
                           height="10"
                           layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 931e44b319feeb0633143574f098c6199c777361..fa5b6062df3ea7f5ac49bc9567a9f732a64b841d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11405,7 +11405,20 @@ Are you sure you want to continue?
      notext="No"
      yestext="Yes"/>
   </notification>
-  
+
+  <notification
+ icon="alertmodal.tga"
+ name="PersonalSettingsConfirmReset"
+ type="alertmodal">
+    You are about to remove all applied Personal lighting settings.
+    Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="SettingsMakeNoTrans"