summaryrefslogtreecommitdiff
path: root/indra/newview/llremoteparcelrequest.cpp
diff options
context:
space:
mode:
authorCallum Linden <callum@lindenlab.com>2022-08-30 15:23:37 -0700
committerCallum Linden <callum@lindenlab.com>2022-08-30 15:23:37 -0700
commit2aace1793b2940c86b2aa0d001137d09aec82dae (patch)
treecae30bd3700fe91c23adce45aeae17531f5f70db /indra/newview/llremoteparcelrequest.cpp
parentef58b9751a514e5e63cd77f9f78e6513bc6403cd (diff)
parentd31a83fb946c49a38376ea3b312b5380d0c8c065 (diff)
Merge branch 'master' into DRTVWR-568
Diffstat (limited to 'indra/newview/llremoteparcelrequest.cpp')
-rw-r--r--indra/newview/llremoteparcelrequest.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp
index 055ccd5818..f4ace52faa 100644
--- a/indra/newview/llremoteparcelrequest.cpp
+++ b/indra/newview/llremoteparcelrequest.cpp
@@ -213,7 +213,12 @@ void LLRemoteParcelInfoProcessor::regionParcelInfoCoro(std::string url,
if (!status)
{
- observer->setErrorStatus(status.getStatus(), status.getMessage());
+ std::string message = status.getMessage();
+ if (message.empty())
+ {
+ message = status.toString();
+ }
+ observer->setErrorStatus(status.getStatus(), message);
}
else
{