Skip to content
Snippets Groups Projects
Commit f00a23bb authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Kick RLV

parent 353c42e1
No related branches found
No related tags found
No related merge requests found
...@@ -229,6 +229,8 @@ bool RlvActions::canShowName(EShowNamesContext eContext, const LLUUID& idAgent) ...@@ -229,6 +229,8 @@ bool RlvActions::canShowName(EShowNamesContext eContext, const LLUUID& idAgent)
case SNC_TELEPORTOFFER: case SNC_TELEPORTOFFER:
case SNC_TELEPORTREQUEST: case SNC_TELEPORTREQUEST:
return gRlvHandler.isException(RLV_BHVR_SHOWNAMES, idAgent) || (gAgentID == idAgent); return gRlvHandler.isException(RLV_BHVR_SHOWNAMES, idAgent) || (gAgentID == idAgent);
default:
return true;
} }
} }
return false; return false;
......
...@@ -747,7 +747,7 @@ void RlvHandler::changed(const LLUUID& idGroup, LLGroupChange change) ...@@ -747,7 +747,7 @@ void RlvHandler::changed(const LLUUID& idGroup, LLGroupChange change)
bool RlvHandler::handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& sdUserdata) 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; static LLUUID s_idLastAgentGroup = LLUUID::null;
if (s_idLastAgentGroup != gAgent.getGroupID()) if (s_idLastAgentGroup != gAgent.getGroupID())
{ {
...@@ -3308,7 +3308,7 @@ ERlvCmdRet RlvHandler::processReplyCommand(const RlvCommand& rlvCmd) const ...@@ -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 // 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) 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; break;
...@@ -3370,7 +3370,7 @@ ERlvCmdRet RlvHandler::onFindFolder(const RlvCommand& rlvCmd, std::string& strRe ...@@ -3370,7 +3370,7 @@ ERlvCmdRet RlvHandler::onFindFolder(const RlvCommand& rlvCmd, std::string& strRe
{ {
if (!strReply.empty()) if (!strReply.empty())
strReply.push_back(','); 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) ...@@ -3595,7 +3595,7 @@ ERlvCmdRet RlvHandler::onGetInv(const RlvCommand& rlvCmd, std::string& strReply)
{ {
if (!strReply.empty()) if (!strReply.empty())
strReply.push_back(','); strReply.push_back(',');
absl::StrAppend(&strReply, strFolder); strReply += strFolder;
} }
} }
return RLV_RET_SUCCESS; return RLV_RET_SUCCESS;
...@@ -3776,7 +3776,7 @@ ERlvCmdRet RlvHandler::onGetPath(const RlvCommand& rlvCmd, std::string& strReply ...@@ -3776,7 +3776,7 @@ ERlvCmdRet RlvHandler::onGetPath(const RlvCommand& rlvCmd, std::string& strReply
{ {
if (!strReply.empty()) if (!strReply.empty())
strReply.push_back(','); strReply.push_back(',');
absl::StrAppend(&strReply, RlvInventory::instance().getSharedPath(folders.at(idxFolder))); strReply += RlvInventory::instance().getSharedPath(folders.at(idxFolder));
} }
} }
} }
......
...@@ -452,7 +452,7 @@ void RlvRenameOnWearObserver::doneIdle() ...@@ -452,7 +452,7 @@ void RlvRenameOnWearObserver::doneIdle()
std::string strName = pItem->getName(); std::string strName = pItem->getName();
LLStringUtil::truncate(strName, DB_INV_ITEM_NAME_STR_LEN - strAttachPt.length() - 3); LLStringUtil::truncate(strName, DB_INV_ITEM_NAME_STR_LEN - strAttachPt.length() - 3);
absl::StrAppend(&strName, " (", strAttachPt, ")"); strName += " (" + strAttachPt + ")";
pItem->rename(strName); pItem->rename(strName);
pItem->updateServer(FALSE); pItem->updateServer(FALSE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment