diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-09-23 20:20:27 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-09-23 20:20:27 +0100 |
| commit | 1cba874abf6f955cf52d68c30c3230ec58528057 (patch) | |
| tree | aab7c3a11e440fdb8c1e70f2c625e6f6034cf2c2 /indra/newview/llfloaterperms.cpp | |
| parent | 1049f15c9cbb3d9fdd3f1f8529b7ca46c5f2b7f3 (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-517
Diffstat (limited to 'indra/newview/llfloaterperms.cpp')
| -rw-r--r-- | indra/newview/llfloaterperms.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index 3968f43485..649a107d74 100644 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -178,7 +178,6 @@ void LLFloaterPermsDefault::sendInitialPerms() if(!mCapSent) { updateCap(); - setCapSent(true); } } @@ -240,7 +239,7 @@ void LLFloaterPermsDefault::updateCapCoro(std::string url) { const std::string& reason = status.toString(); // Do not display the same error more than once in a row - if (reason != previousReason) + if ((reason != previousReason) && mCapSent) { previousReason = reason; LLSD args; |