summaryrefslogtreecommitdiff
path: root/indra/newview/llwlhandlers.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
-rw-r--r--indra/newview/llwlhandlers.cpp114
1 files changed, 57 insertions, 57 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index d55e1b7cd3..4e3a7a8788 100644
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llwlhandlers.cpp
* @brief Various classes which handle Windlight-related messaging
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2011, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -40,50 +40,50 @@
// static
bool LLEnvironmentRequest::initiate(LLEnvironment::environment_apply_fn cb)
{
- LLViewerRegion* cur_region = gAgent.getRegion();
+ LLViewerRegion* cur_region = gAgent.getRegion();
- if (!cur_region)
- {
- LL_WARNS("WindlightCaps") << "Viewer region not set yet, skipping env. settings request" << LL_ENDL;
- return false;
- }
+ if (!cur_region)
+ {
+ LL_WARNS("WindlightCaps") << "Viewer region not set yet, skipping env. settings request" << LL_ENDL;
+ return false;
+ }
- if (!cur_region->capabilitiesReceived())
- {
- LL_INFOS("WindlightCaps") << "Deferring windlight settings request until we've got region caps" << LL_ENDL;
+ if (!cur_region->capabilitiesReceived())
+ {
+ LL_INFOS("WindlightCaps") << "Deferring windlight settings request until we've got region caps" << LL_ENDL;
cur_region->setCapabilitiesReceivedCallback([cb](const LLUUID &region_id, LLViewerRegion* regionp) { LLEnvironmentRequest::onRegionCapsReceived(region_id, cb); });
- return false;
- }
+ return false;
+ }
- return doRequest(cb);
+ return doRequest(cb);
}
// static
void LLEnvironmentRequest::onRegionCapsReceived(const LLUUID& region_id, LLEnvironment::environment_apply_fn cb)
{
- if (region_id != gAgent.getRegion()->getRegionID())
- {
- LL_INFOS("WindlightCaps") << "Got caps for a non-current region" << LL_ENDL;
- return;
- }
-
- LL_DEBUGS("WindlightCaps") << "Received region capabilities" << LL_ENDL;
- doRequest(cb);
+ if (region_id != gAgent.getRegion()->getRegionID())
+ {
+ LL_INFOS("WindlightCaps") << "Got caps for a non-current region" << LL_ENDL;
+ return;
+ }
+
+ LL_DEBUGS("WindlightCaps") << "Received region capabilities" << LL_ENDL;
+ doRequest(cb);
}
// static
bool LLEnvironmentRequest::doRequest(LLEnvironment::environment_apply_fn cb)
{
- std::string url = gAgent.getRegionCapability("EnvironmentSettings");
- if (url.empty())
- {
- 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
+ std::string url = gAgent.getRegionCapability("EnvironmentSettings");
+ if (url.empty())
+ {
+ 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;
- }
+ return false;
+ }
std::string coroname =
LLCoros::instance().launch("LLEnvironmentRequest::environmentRequestCoro",
@@ -95,12 +95,12 @@ bool LLEnvironmentRequest::doRequest(LLEnvironment::environment_apply_fn cb)
S32 LLEnvironmentRequest::sLastRequest = 0;
-//static
+//static
void LLEnvironmentRequest::environmentRequestCoro(std::string url, LLEnvironment::environment_apply_fn cb)
{
LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
S32 requestId = ++LLEnvironmentRequest::sLastRequest;
- LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
+ LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("EnvironmentRequest", httpPolicy));
LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
@@ -159,26 +159,26 @@ clock_t LLEnvironmentApply::sLastUpdate = clock_t(0.f);
// static
bool LLEnvironmentApply::initiateRequest(const LLSD& content, LLEnvironment::environment_apply_fn cb)
{
- clock_t current = clock();
-
- // Make sure we don't update too frequently.
- if (current < sLastUpdate + (UPDATE_WAIT_SECONDS * CLOCKS_PER_SEC))
- {
- LLSD args(LLSD::emptyMap());
- args["WAIT"] = (F64)UPDATE_WAIT_SECONDS;
- LLNotificationsUtil::add("EnvUpdateRate", args);
- return false;
- }
-
- sLastUpdate = current;
-
- // Send update request.
- std::string url = gAgent.getRegionCapability("ExtEnvironment");
- if (url.empty())
- {
- LL_WARNS("WindlightCaps") << "Applying windlight settings not supported" << LL_ENDL;
- return false;
- }
+ clock_t current = clock();
+
+ // Make sure we don't update too frequently.
+ if (current < sLastUpdate + (UPDATE_WAIT_SECONDS * CLOCKS_PER_SEC))
+ {
+ LLSD args(LLSD::emptyMap());
+ args["WAIT"] = (F64)UPDATE_WAIT_SECONDS;
+ LLNotificationsUtil::add("EnvUpdateRate", args);
+ return false;
+ }
+
+ sLastUpdate = current;
+
+ // Send update request.
+ std::string url = gAgent.getRegionCapability("ExtEnvironment");
+ if (url.empty())
+ {
+ LL_WARNS("WindlightCaps") << "Applying windlight settings not supported" << LL_ENDL;
+ return false;
+ }
LL_INFOS("WindlightCaps") << "Sending windlight settings to " << url << LL_ENDL;
LL_DEBUGS("WindlightCaps") << "content: " << content << LL_ENDL;
@@ -186,7 +186,7 @@ bool LLEnvironmentApply::initiateRequest(const LLSD& content, LLEnvironment::env
std::string coroname =
LLCoros::instance().launch("LLEnvironmentApply::environmentApplyCoro",
[url, content, cb]() { LLEnvironmentApply::environmentApplyCoro(url, content, cb); });
- return true;
+ return true;
}
void LLEnvironmentApply::environmentApplyCoro(std::string url, LLSD content, LLEnvironment::environment_apply_fn cb)
@@ -214,7 +214,7 @@ void LLEnvironmentApply::environmentApplyCoro(std::string url, LLSD content, LLE
* }
*/
- do // while false.
+ do // while false.
{ // Breaks from loop in the case of an error.
LLSD httpResults = result["http_result"];
@@ -235,7 +235,7 @@ void LLEnvironmentApply::environmentApplyCoro(std::string url, LLSD content, LLE
notify = LLSD::emptyMap();
notify["FAIL_REASON"] = "Missing regionID, malformed response";
break;
- }
+ }
else if (result["regionID"].asUUID() != gAgent.getRegion()->getRegionID())
{
// note that there is no report to the user in this failure case.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:41:15 +0000