Merge branch 'main' into release/luau-scripting.

1 files changed, 12 insertions, 13 deletions

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index f9c5f42de7..038030a1f6 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -241,7 +241,7 @@ static void on_avatar_name_cache_start_call(const LLUUID& agent_id,
                                             const LLAvatarName& av_name)
 {
     std::string name = av_name.getDisplayName();
-    LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id, true);
+    LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id, LLSD());
     if (session_id != LLUUID::null)
     {
         gIMMgr->startCall(session_id);
@@ -277,8 +277,7 @@ void LLAvatarActions::startAdhocCall(const uuid_vec_t& ids, const LLUUID& floate
 
     // create the new ad hoc voice session
     const std::string title = LLTrans::getString("conference-title");
-    LLUUID session_id = gIMMgr->addSession(title, IM_SESSION_CONFERENCE_START,
-                                           ids[0], id_array, true, floater_id);
+    LLUUID session_id = gIMMgr->addSession(title, IM_SESSION_CONFERENCE_START, ids[0], id_array, LLSD(), floater_id);
     if (session_id == LLUUID::null)
     {
         return;
@@ -322,7 +321,7 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids, const LLUUID& float
         id_array.push_back(*it);
     }
     const std::string title = LLTrans::getString("conference-title");
-    LLUUID session_id = gIMMgr->addSession(title, IM_SESSION_CONFERENCE_START, ids[0], id_array, false, floater_id);
+    LLUUID  session_id = gIMMgr->addSession(title, IM_SESSION_CONFERENCE_START, ids[0], id_array, LLSD(), floater_id);
 
     if (session_id == LLUUID::null)
     {
@@ -528,7 +527,7 @@ void LLAvatarActions::teleport_request_callback(const LLSD& notification, const
         msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 
         msg->nextBlockFast(_PREHASH_MessageBlock);
-        msg->addBOOLFast(_PREHASH_FromGroup, FALSE);
+        msg->addBOOLFast(_PREHASH_FromGroup, false);
         msg->addUUIDFast(_PREHASH_ToAgentID, notification["substitutions"]["uuid"] );
         msg->addU8Fast(_PREHASH_Offline, IM_ONLINE);
         msg->addU8Fast(_PREHASH_Dialog, IM_TELEPORT_REQUEST);
@@ -653,8 +652,8 @@ void LLAvatarActions::csr(const LLUUID& id, std::string name)
     std::string url = "http://csr.lindenlab.com/agent/";
 
     // slow and stupid, but it's late
-    S32 len = name.length();
-    for (S32 i = 0; i < len; i++)
+    auto len = name.length();
+    for (size_t i = 0; i < len; i++)
     {
         if (name[i] == ' ')
         {
@@ -717,7 +716,7 @@ namespace action_give_inventory
      */
     static LLInventoryPanel* get_active_inventory_panel()
     {
-        LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
+        LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(false);
         LLFloater* floater_appearance = LLFloaterReg::findInstance("appearance");
         if (!active_panel || (floater_appearance && floater_appearance->hasFocus()))
         {
@@ -829,11 +828,11 @@ namespace action_give_inventory
             return;
         }
 
-        S32 count = LLShareInfo::instance().mAvatarNames.size();
+        auto count = LLShareInfo::instance().mAvatarNames.size();
         bool shared = count && !inventory_selected_uuids.empty();
 
         // iterate through avatars
-        for(S32 i = 0; i < count; ++i)
+        for(size_t i = 0; i < count; ++i)
         {
             const LLUUID& avatar_uuid = LLShareInfo::instance().mAvatarUuids[i];
 
@@ -1056,7 +1055,7 @@ void LLAvatarActions::shareWithAvatars(LLView * panel)
     LLFloater* root_floater = gFloaterView->getParentFloater(panel);
     LLInventoryPanel* inv_panel = dynamic_cast<LLInventoryPanel*>(panel);
     LLFloaterAvatarPicker* picker =
-        LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2, inv_panel), TRUE, FALSE, FALSE, root_floater->getName());
+        LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2, inv_panel), true, false, false, root_floater->getName());
     if (!picker)
     {
         return;
@@ -1078,7 +1077,7 @@ void LLAvatarActions::shareWithAvatars(const uuid_set_t inventory_selected_uuids
     using namespace action_give_inventory;
 
     LLFloaterAvatarPicker* picker =
-        LLFloaterAvatarPicker::show(boost::bind(give_inventory_ids, _1, _2, inventory_selected_uuids), TRUE, FALSE, FALSE, root_floater->getName());
+        LLFloaterAvatarPicker::show(boost::bind(give_inventory_ids, _1, _2, inventory_selected_uuids), true, false, false, root_floater->getName());
     if (!picker)
     {
         return;
@@ -1289,7 +1288,7 @@ bool LLAvatarActions::handleRemove(const LLSD& notification, const LLSD& respons
             case 0: // YES
                 if( ip->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS))
                 {
-                    LLAvatarTracker::instance().empower(id, FALSE);
+                    LLAvatarTracker::instance().empower(id, false);
                     LLAvatarTracker::instance().notifyObservers();
                 }
                 LLAvatarTracker::instance().terminateBuddy(id);