STORM-1253 WIP Changed the workflow to modify region day cycle.

Was: Press "Save" after editing the region day cycle in the Day Cycle Editor.
Now:
- Press "Save" in the Day Cycle Editor.
- Open Region / Estate -> Environment tab.
- Select the region day cycle.
- Press "Apply".

1 files changed, 5 insertions, 4 deletions

diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp
index ca5b65f0da..80001525f8 100644
--- a/indra/newview/llwldaycycle.cpp
+++ b/indra/newview/llwldaycycle.cpp
@@ -67,9 +67,10 @@ void LLWLDayCycle::loadDayCycle(const LLSD& day_data, LLWLParamKey::EScope scope
 			LLWLParamManager::getInstance()->getParamSet(frame, pset);
 		if(!success)
 		{
-			// *HACK try the local-scope ones for "A-something" defaults
-			// (because our envManager.lindenDefault() doesn't have the skies yet)
-			if (frame.name.find("A-") == 0)
+			// *HACK: If loading region day cycle, try local sky presets as well.
+			// Local presets may be referenced by a region day cycle after
+			// it has been edited but the changes have not been uploaded.
+			if (scope == LLEnvKey::SCOPE_REGION)
 			{
 				frame.scope = LLEnvKey::SCOPE_LOCAL;
 				success = LLWLParamManager::getInstance()->getParamSet(frame, pset);
@@ -80,7 +81,7 @@ void LLWLDayCycle::loadDayCycle(const LLSD& day_data, LLWLParamKey::EScope scope
 				// alert the user
 				LLSD args;
 				args["SKY"] = day_data[i][1].asString();
-				LLNotifications::instance().add("WLMissingSky", LLSD(), args);
+				LLNotifications::instance().add("WLMissingSky", args, LLSD());
 				continue;
 			}
 		}