diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-07-05 18:00:00 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-07-05 18:00:00 +0300 |
| commit | a1466bcdaf8f085b62855ee05d943b20a9c7dfc8 (patch) | |
| tree | 4bc1ae29e335e6eaa682ccc2a82e6ff9f7e5a578 /indra/newview/llfloaterregioninfo.cpp | |
| parent | 7ee5ee3dfdda7809c1ff3c40d6de2f01e5e207aa (diff) | |
MAINT-8587 FIXED "(waiting)" instead of a group name in the Allowed Groups list.
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 9f7fa82529..4f1c26d793 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -3835,16 +3835,19 @@ bool LLPanelEstateAccess::accessCoreConfirm(const LLSD& notification, const LLSD sendEstateAccessDelta(flags, id); - // fill the name list for confirmation - LLAvatarName av_name; - if (LLAvatarNameCache::get(id, &av_name)) + if ((flags & (ESTATE_ACCESS_ALLOWED_GROUP_ADD | ESTATE_ACCESS_ALLOWED_GROUP_REMOVE)) == 0) { - if (!names.empty()) + // fill the name list for confirmation + LLAvatarName av_name; + if (LLAvatarNameCache::get(id, &av_name)) { - names += ", "; - single = false; + if (!names.empty()) + { + names += ", "; + single = false; + } + names += av_name.getCompleteName(); } - names += av_name.getCompleteName(); } } LLPanelEstateAccess* panel = LLFloaterRegionInfo::getPanelAccess(); |