diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-22 22:51:33 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-22 22:51:33 +0300 |
commit | 730af5d4888653ce2ccb4bae6dd3919619d58a30 (patch) | |
tree | b9b5f7f7b9bfdca690c317dc8c90a23f0a2dd1bf /indra/newview/llfloaterperms.cpp | |
parent | bdedfb3755d54a6b4468a5251c9ddeae2b092d37 (diff) | |
parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) |
Merged master (DRTVWR-503) into DRTVWR-482
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; |