Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_import

1 files changed, 29 insertions, 33 deletions

diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp
index 8032e207cd..81c0bd97be 100644
--- a/indra/newview/llpanelgroupbulk.cpp
+++ b/indra/newview/llpanelgroupbulk.cpp
@@ -54,17 +54,16 @@
 //////////////////////////////////////////////////////////////////////////
 LLPanelGroupBulkImpl::LLPanelGroupBulkImpl(const LLUUID& group_id) :
     mGroupID(group_id),
-    mBulkAgentList(NULL),
-    mOKButton(NULL),
+    mBulkAgentList(nullptr),
+    mOKButton(nullptr),
     mAddButton(nullptr),
-    mRemoveButton(NULL),
-    mGroupName(NULL),
+    mRemoveButton(nullptr),
+    mGroupName(nullptr),
     mLoadingText(),
     mTooManySelected(),
-    mCloseCallback(NULL),
-    mCloseCallbackUserData(NULL),
-    mAvatarNameCacheConnection(),
-    mRoleNames(NULL),
+    mCloseCallback(nullptr),
+    mCloseCallbackUserData(nullptr),
+    mRoleNames(nullptr),
     mOwnerWarning(),
     mAlreadyInGroup(),
     mConfirmedOwnerInvite(false),
@@ -74,10 +73,13 @@ LLPanelGroupBulkImpl::LLPanelGroupBulkImpl(const LLUUID& group_id) :
 
 LLPanelGroupBulkImpl::~LLPanelGroupBulkImpl()
 {
-    if (mAvatarNameCacheConnection.connected())
+    for (auto& [id, connection] : mAvatarNameCacheConnections)
     {
-        mAvatarNameCacheConnection.disconnect();
+        if (connection.connected())
+            connection.disconnect();
     }
+
+    mAvatarNameCacheConnections.clear();
 }
 
 void LLPanelGroupBulkImpl::callbackClickAdd(LLPanelGroupBulk* panelp)
@@ -124,43 +126,42 @@ void LLPanelGroupBulkImpl::callbackSelect(LLUICtrl* ctrl, void* userdata)
 
 void LLPanelGroupBulkImpl::addUsers(const uuid_vec_t& agent_ids)
 {
-    std::vector<std::string> names;
     for (const LLUUID& agent_id : agent_ids)
     {
-        LLAvatarName av_name;
-        if (LLAvatarNameCache::get(agent_id, &av_name))
+        if (LLAvatarName av_name; LLAvatarNameCache::get(agent_id, &av_name))
         {
             onAvatarNameCache(agent_id, av_name);
         }
         else
         {
-            if (mAvatarNameCacheConnection.connected())
+            if (auto found = mAvatarNameCacheConnections.find(agent_id); found != mAvatarNameCacheConnections.end())
             {
-                mAvatarNameCacheConnection.disconnect();
+                if (found->second.connected())
+                    found->second.disconnect();
+
+                mAvatarNameCacheConnections.erase(found);
             }
-            // *TODO : Add a callback per avatar name being fetched.
-            mAvatarNameCacheConnection = LLAvatarNameCache::get(agent_id,
+
+            mAvatarNameCacheConnections.try_emplace(agent_id, LLAvatarNameCache::get(agent_id,
                 [&](const LLUUID& agent_id, const LLAvatarName& av_name)
                 {
                     onAvatarNameCache(agent_id, av_name);
-                });
+                }));
         }
     }
 }
 
 void LLPanelGroupBulkImpl::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name)
 {
-    if (mAvatarNameCacheConnection.connected())
+    if (auto found = mAvatarNameCacheConnections.find(agent_id); found != mAvatarNameCacheConnections.end())
     {
-        mAvatarNameCacheConnection.disconnect();
-    }
+        if (found->second.connected())
+            found->second.disconnect();
 
-    std::vector<std::string> names;
-    uuid_vec_t agent_ids;
-    agent_ids.push_back(agent_id);
-    names.push_back(av_name.getCompleteName());
+        mAvatarNameCacheConnections.erase(found);
+    }
 
-    addUsers(names, agent_ids);
+    addUsers({ av_name.getCompleteName() }, { agent_id });
 }
 
 void LLPanelGroupBulkImpl::handleRemove()
@@ -232,7 +233,7 @@ void LLPanelGroupBulkImpl::addUsers(const std::vector<std::string>& names, const
     }
 }
 
-void LLPanelGroupBulkImpl::setGroupName(std::string name)
+void LLPanelGroupBulkImpl::setGroupName(const std::string& name)
 {
     if (mGroupName)
     {
@@ -337,12 +338,7 @@ void LLPanelGroupBulk::updateGroupData()
 
 void LLPanelGroupBulk::addUserCallback(const LLUUID& id, const LLAvatarName& av_name)
 {
-    std::vector<std::string> names;
-    uuid_vec_t agent_ids;
-    agent_ids.push_back(id);
-    names.push_back(av_name.getAccountName());
-
-    mImplementation->addUsers(names, agent_ids);
+    mImplementation->addUsers({ av_name.getAccountName() }, { id });
 }
 
 void LLPanelGroupBulk::setCloseCallback(void (*close_callback)(void*), void* data)