summaryrefslogtreecommitdiff
path: root/indra/newview/llwlhandlers.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-08-08 15:41:28 -0700
committerRider Linden <rider@lindenlab.com>2018-08-08 15:41:28 -0700
commit881ee670d92f13ac518a74e1bff81bf69e07ccfa (patch)
tree23d96163b2aac869bd6ec64b32b8f1fc79d0c7dd /indra/newview/llwlhandlers.cpp
parent51abc168c03f80d63c85d4bb48624f440b585390 (diff)
Fix for mac build
MAINT-8870, MAINT-8871: When legacy windlight fails load the default day cycle asset and use that.
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
-rw-r--r--indra/newview/llwlhandlers.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index 6aa379e0de..f0453b4d6d 100644
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -80,6 +80,9 @@ bool LLEnvironmentRequest::doRequest()
{
LL_INFOS("WindlightCaps") << "Skipping windlight setting request - we don't have this capability" << LL_ENDL;
// region is apparently not capable of this; don't respond at all
+ // (there shouldn't be any regions where this is the case... but
+ LL_INFOS("ENVIRONMENT") << "No legacy windlight caps... just set the region to be the default day." << LL_ENDL;
+ LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_REGION, LLSettingsDay::GetDefaultAssetId());
return false;
}
@@ -117,8 +120,8 @@ void LLEnvironmentRequest::environmentRequestCoro(std::string url)
if (!status)
{
LL_WARNS("WindlightCaps") << "Got an error, not using region windlight... " << LL_ENDL;
- LLEnvironment::instance().onLegacyRegionSettings(LLSD());
-
+ LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_REGION, LLSettingsDay::GetDefaultAssetId());
+
return;
}
result = result["content"];