diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 12ca1ac71b167601b47eac481614176216803d67..3a481819a5ee51d9ca311c120a8ee385857f9348 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -1293,7 +1293,7 @@ void LLButton::setFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname)
 	// Set the button control value (toggle state) to the floater visibility control (Sets the value as well)
 	button->setControlVariable(LLFloater::getControlGroup()->getControl(vis_control_name));
 	// Set the clicked callback to toggle the floater
-	button->setClickedCallback([](LLUICtrl* ctrl, const LLSD& param) -> void { LLFloaterReg::toggleInstance(param.asStringRef(), LLSD()); });
+	button->setClickedCallback([=](LLUICtrl* ctrl, const LLSD& param) -> void { LLFloaterReg::toggleInstance(sdname.asStringRef(), LLSD()); });
 }
 
 // static
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index a8c71425a28bf98aa652797755fa122022a08481..e880fec8077b38bf9dcc4d1a8eabb78abfd6dc06 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -201,6 +201,16 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="people"
            />
+  <command name="personal_lighting"
+           available_in_toybox="true"
+           icon="Command_PersonalLighting_Icon"
+           label_ref="Command_PersonalLighting_Label"
+           tooltip_ref="Command_PersonalLighting_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="env_adjust_snapshot"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="env_adjust_snapshot"
+           />
   <command name="picks"
            available_in_toybox="true"
            icon="Command_Picks_Icon"
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 435250e92bbc97c33a97e62747142ad9d483cf8a..e67c37bf1e7001bc8d3dd85dfb248a20b084038c 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -645,7 +645,7 @@ void LLLocationInputCtrl::onInfoButtonClicked()
 		return;
 // [/RLVa:KB]
 
-	LLFloaterReg::showInstance("about_land");
+	LLFloaterSidePanelContainer::showPanel("places", LLSD().with("type", "agent"));
 }
 
 void LLLocationInputCtrl::onForSaleButtonClicked()
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ce5efb9e69b99613b9dc17c5bb1ec32a8d4d5c9d..9e7af1278feb0583a4bd92a2553787ead016d067 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -158,6 +158,7 @@ with the same filename but different name
   <texture name="Command_Panic_Icon"        file_name="toolbar_icons/panic.png"        preload="false" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
   <texture name="Command_Performance_Icon"  file_name="toolbar_icons/performance.png"  preload="true" />
+  <texture name="Command_PersonalLighting_Icon"  file_name="toolbar_icons/personal_lighting.png"  preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
   <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png"       preload="true" />
   <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png"  preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/personal_lighting.png b/indra/newview/skins/default/textures/toolbar_icons/personal_lighting.png
new file mode 100644
index 0000000000000000000000000000000000000000..133f8bb967d900148d46fdcfbc658eb2c66f1d59
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/personal_lighting.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 8e9c86f12cd25e6324699fd3ab21f57bdd794024..2dbb28ccfa6ab7470ca86444b5ad6567c3e1efae 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -119,6 +119,22 @@
 	         tool_tip="Teleport to my home location"
 	         top_delta="0"
 	         width="32" />
+	        <button
+	         follows="left|top"
+	         height="23"
+	         image_bottom_pad="1"
+	         image_overlay="Command_AboutLand_Icon"
+	         image_hover_unselected="PushButton_Over"
+	         layout="topleft"
+	         left_pad="5"
+	         name="about_land"
+	         tool_tip="Opens the About Land floater"
+	         top_delta="0"
+	         width="32" >
+             <button.init_callback
+              function="Button.SetFloaterToggle"
+	          parameter="about_land" />
+		     </button>
 	        <location_input
                        follows="all"
 	         halign="right"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 6e4a70b45ca6d3350e51b4f31dc9caa85d93e852..785ec01d1201188f52b2cedc14909c958bf306da 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4224,6 +4224,7 @@ name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_Panic_Label">Panic!</string>
   <string name="Command_People_Label">People</string>
   <string name="Command_Performance_Label">Graphics speed</string>
+  <string name="Command_PersonalLighting_Label">Personal Lighting</string>
   <string name="Command_Picks_Label">Picks</string>
   <string name="Command_Places_Label">Places</string>
   <string name="Command_Preferences_Label">Preferences</string>
@@ -4241,8 +4242,7 @@ name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_Voice_Label">Voice Settings</string>
   <string name="Command_Webbrowser_Label">Web Browser</string>
 
-  <string 
-name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
+  <string name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_AnimationOverride_Tooltip">Animation Override</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
@@ -4267,6 +4267,7 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
   <string name="Command_Panic_Tooltip">Press this if you're in trouble</string>
   <string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
   <string name="Command_Performance_Tooltip">Improve graphics speed</string>
+  <string name="Command_PersonalLighting_Tooltip">Modify your personal environment lighting</string>
   <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>
   <string name="Command_Places_Tooltip">Places you've saved</string>
   <string name="Command_Preferences_Tooltip">Preferences</string>