Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EEP] Use ExtEnvironment cap where possible

Browse Source
This commit is contained in:
Lirusaito
2019-03-25 14:33:14 -04:00
parent 059fc7c4fa
commit ffe729a53b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llviewerregion.cpp
View File

@@ -1986,6 +1986,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("EnvironmentSettings");
capabilityNames.append("EstateChangeInfo");
capabilityNames.append("EventQueueGet");
capabilityNames.append("ExtEnvironment");
capabilityNames.append("FetchLib2");
capabilityNames.append("FetchLibDescendents2");
capabilityNames.append("FetchInventory2");

3
indra/newview/llwlhandlers.cpp
View File

@@ -158,7 +158,8 @@ bool LLEnvironmentApply::initiateRequest(const LLSD& content)
sLastUpdate = current;
// Send update request.
std::string url = gAgent.getRegion()->getCapability("EnvironmentSettings");
std::string url = gAgent.getRegionCapability("ExtEnvironment");
if (url.empty()) url = gAgent.getRegionCapability("EnvironmentSettings");
if (url.empty())
{
LL_WARNS("WindlightCaps") << "Applying windlight settings not supported" << LL_ENDL;