diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index a18fd56aa8b84d2f693557b8387d786d92126c59..f469489f910db065f15d53bc79f998049ff7beea 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 92f5c6154e2e92ee0e3b2b014c318b2e79b24dde..b99a24d3e3730c7d3e8034e88db53b8efb8aa380 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 d5ff0f5dc98a277bfc84db2db68060bc79503b2f..c29a7f38636a2ff6e1a7568ddf5f886305fcb682 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);