summaryrefslogtreecommitdiff
path: root/indra/newview/llenvironment.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llenvironment.cpp')
-rw-r--r--indra/newview/llenvironment.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 3451b0efef..e64d71e228 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -1009,14 +1009,12 @@ void LLEnvironment::coroUpdateEnvironment(S32 parcel_id, LLSettingsDay::ptr_t pd
LLSD httpResults = result["http_result"];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
- if (!status)
+ if ((!status) || !result["success"].asBoolean())
{
LL_WARNS("WindlightCaps") << "Couldn't update Windlight settings for " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL;
- std::stringstream msg;
- msg << status.toString() << " (Code " << status.toTerseString() << ")";
notify = LLSD::emptyMap();
- notify["FAIL_REASON"] = msg.str();
+ notify["FAIL_REASON"] = result["message"].asString();
}
else
{
@@ -1063,15 +1061,12 @@ void LLEnvironment::coroResetEnvironment(S32 parcel_id, environment_apply_fn app
LLSD httpResults = result["http_result"];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
- if (!status)
+ if ((!status) || !result["success"].asBoolean())
{
- LL_WARNS("WindlightCaps") << "Couldn't reset Windlight settings in " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL;
+ LL_WARNS("WindlightCaps") << "Couldn't reset Windlight settings in " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL;
- std::stringstream msg;
- msg << status.toString() << " (Code " << status.toTerseString() << ")";
notify = LLSD::emptyMap();
- notify["FAIL_REASON"] = msg.str();
-
+ notify["FAIL_REASON"] = result["message"].asString();
}
else
{