From f00a23bbb58746ad5a92f81b7c08865082a0ca80 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 20 Dec 2020 21:03:44 -0500
Subject: [PATCH] Kick RLV
---
indra/newview/rlvactions.cpp | 2 ++
indra/newview/rlvhandler.cpp | 10 +++++-----
indra/newview/rlvinventory.cpp | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index a18fd56aa8b..f469489f910 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -229,6 +229,8 @@ bool RlvActions::canShowName(EShowNamesContext eContext, const LLUUID& idAgent)
case SNC_TELEPORTOFFER:
case SNC_TELEPORTREQUEST:
return gRlvHandler.isException(RLV_BHVR_SHOWNAMES, idAgent) || (gAgentID == idAgent);
+ default:
+ return true;
}
}
return false;
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 92f5c6154e2..b99a24d3e37 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -747,7 +747,7 @@ void RlvHandler::changed(const LLUUID& idGroup, LLGroupChange change)
bool RlvHandler::handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& sdUserdata)
{
- // NOTE: we'll fire once for every group the user belongs to so we need to manually keep track of changes
+ // NOTE: we'll fire once for every group the user belongs to so we need to manually keep track of pending changes
static LLUUID s_idLastAgentGroup = LLUUID::null;
if (s_idLastAgentGroup != gAgent.getGroupID())
{
@@ -3308,7 +3308,7 @@ ERlvCmdRet RlvHandler::processReplyCommand(const RlvCommand& rlvCmd) const
{
// NOTE: specification says response should start with '/' but RLV-1.16.1 returns an empty string when no rules are set
for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
- absl::StrAppend(&strReply, itObj->second.getStatusString(strFilter, strSeparator));
+ strReply += itObj->second.getStatusString(strFilter, strSeparator);
}
}
break;
@@ -3370,7 +3370,7 @@ ERlvCmdRet RlvHandler::onFindFolder(const RlvCommand& rlvCmd, std::string& strRe
{
if (!strReply.empty())
strReply.push_back(',');
- absl::StrAppend(&strReply, RlvInventory::instance().getSharedPath(folders.at(idxFolder)));
+ strReply += RlvInventory::instance().getSharedPath(folders.at(idxFolder));
}
}
}
@@ -3595,7 +3595,7 @@ ERlvCmdRet RlvHandler::onGetInv(const RlvCommand& rlvCmd, std::string& strReply)
{
if (!strReply.empty())
strReply.push_back(',');
- absl::StrAppend(&strReply, strFolder);
+ strReply += strFolder;
}
}
return RLV_RET_SUCCESS;
@@ -3776,7 +3776,7 @@ ERlvCmdRet RlvHandler::onGetPath(const RlvCommand& rlvCmd, std::string& strReply
{
if (!strReply.empty())
strReply.push_back(',');
- absl::StrAppend(&strReply, RlvInventory::instance().getSharedPath(folders.at(idxFolder)));
+ strReply += RlvInventory::instance().getSharedPath(folders.at(idxFolder));
}
}
}
diff --git a/indra/newview/rlvinventory.cpp b/indra/newview/rlvinventory.cpp
index d5ff0f5dc98..c29a7f38636 100644
--- a/indra/newview/rlvinventory.cpp
+++ b/indra/newview/rlvinventory.cpp
@@ -452,7 +452,7 @@ void RlvRenameOnWearObserver::doneIdle()
std::string strName = pItem->getName();
LLStringUtil::truncate(strName, DB_INV_ITEM_NAME_STR_LEN - strAttachPt.length() - 3);
- absl::StrAppend(&strName, " (", strAttachPt, ")");
+ strName += " (" + strAttachPt + ")";
pItem->rename(strName);
pItem->updateServer(FALSE);
--
GitLab