diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index d45d1e3f84..53e79e46f5 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -10787,6 +10787,38 @@ class LLWorldEnvSettings : public view_listener_t
 // [/RLVa:KB]
 
 		std::string event_name = userdata.asString();
+// <FS:Beq> FIRE-29785 fix daytime shortcuts for non-EEP 
+#ifdef OPENSIM
+		static std::map<std::string, std::string> sky_presets = {
+			{"sunrise", "Sunrise"},
+			{"noon", "Midday"},
+			{"sunset", "Sunset"},
+			{"midnight", "Midnight"}
+		};
+		auto it = sky_presets.find(event_name);
+		if( LLGridManager::getInstance()->isInOpenSim() &&
+			!LLEnvironment::instance().isExtendedEnvironmentEnabled() &&
+			it != sky_presets.end()
+			)
+		{
+			LLSettingsSky::ptr_t legacysky = nullptr;
+			LLSD messages;
+			legacysky = LLEnvironment::createSkyFromLegacyPreset(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", "skies", it->second + ".xml"), messages);
+			if (legacysky)
+			{
+				LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, legacysky);
+				LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
+				LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_FAST, true);
+				defocusEnvFloaters();
+			}		
+			else
+			{
+				LL_WARNS() << "Legacy windlight conversion failed for " << it->second << " existing env unchanged." << LL_ENDL;
+			}
+			return true;
+		}
+#endif
+// </FS:Beq>
 		
 		if (event_name == "sunrise")
 		{
diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp
index d787bef23a..6334549f51 100644
--- a/indra/newview/quickprefs.cpp
+++ b/indra/newview/quickprefs.cpp
@@ -345,7 +345,8 @@ void FloaterQuickPrefs::loadSkyPresets(const std::multimap<std::string, LLUUID>&
 		{
 			// we add by name and only build the envp on demand
 			LL_DEBUGS("WindlightCaps") << "Adding legacy sky " << preset_name << LL_ENDL;
-			mWLPresetsCombo->add(preset_name, LLSD(preset_name));
+			// append "WL" to denote legacy. Have to create a new string not update the reference.
+			mWLPresetsCombo->add(preset_name+ "[WL]", LLSD(preset_name));
 		}
 		LL_DEBUGS("WindlightCaps") << "Done: Adding legacy sky presets to QP" << LL_ENDL;
 	}
@@ -1163,6 +1164,17 @@ void FloaterQuickPrefs::updateRlvRestrictions(ERlvBehaviour behavior, ERlvParamT
 	}
 }
 
+// void FloaterQuickPrefs::onSunMoved()
+// {
+
+// 	F32 val = mWLSunPos->getCurSliderValue();
+
+// 	auto env = LLEnvironment::instance().getSelectedEnvironment() == LLEnvironment::ENV_LOCAL)
+// 	auto day = LLEnvironment::instance().getEnvironmentDay(env);
+	
+
+// }
+
 void FloaterQuickPrefs::enableWindlightButtons(bool enable)
 {
 	childSetEnabled("WLPresetsCombo", enable);