livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-12733 FIXED Default Creation Permissions for Objects is ignored after a relog

master
maxim_productengine 2020-02-24 17:26:16 +02:00
parent d8b47149aa
commit 08b75b5ee7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloaterperms.cpp
View File

@ -177,7 +177,6 @@ void LLFloaterPermsDefault::sendInitialPerms()
if(!mCapSent)
{
updateCap();
setCapSent(true);
}
}
@ -239,7 +238,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;

2
indra/newview/llviewerregion.cpp
View File

@ -3137,7 +3137,7 @@ void LLViewerRegion::setCapabilitiesReceived(bool received)
{
mCapabilitiesReceivedSignal(getRegionID());
//LLFloaterPermsDefault::sendInitialPerms();
LLFloaterPermsDefault::sendInitialPerms();
// This is a single-shot signal. Forget callbacks to save resources.
mCapabilitiesReceivedSignal.disconnect_all_slots();