diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index a6856394275bdaef46472beea7374ba6cc8b9b45..e2b2cb8cc911dc2d169400fd43e4743227a925a8 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -36,6 +36,9 @@
#include "llconversationmodel.h"
#include "llimview.h" //For LLIMModel
#include "lltrans.h"
+// [RLVa:KB] - @shownames
+#include "rlvactions.h"
+// [/RLVa:KB]
#include <boost/foreach.hpp>
@@ -584,8 +587,13 @@ void LLConversationItemParticipant::onAvatarNameCache(const LLAvatarName& av_nam
void LLConversationItemParticipant::updateName(const LLAvatarName& av_name)
{
- mName = av_name.getUserName();
- mDisplayName = av_name.getDisplayName();
+// [RLVa:KB] - @shownames
+ bool fRlvCanShowName = (!mRlvCheckShowNames) || (RlvActions::canShowName(RlvActions::SNC_DEFAULT, mUUID));
+ mName = (fRlvCanShowName) ? av_name.getUserName() : LLStringUtil::null;
+ mDisplayName = (fRlvCanShowName) ? av_name.getDisplayName() : RlvStrings::getAnonym(av_name);
+// [/RLVa:KB]
+// mName = av_name.getUserName();
+// mDisplayName = av_name.getDisplayName();
if (mDisplayModeratorLabel)
{
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 787deeb594036efa3043bc7564c871d3e63ac644..4c9d51d77c4656af53df20aa0a199264e7e7bf3f 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -214,6 +214,10 @@ class LLConversationItemParticipant : public LLConversationItem
void setModeratorOptionsVisible(bool visible) { mDisplayModeratorOptions = visible; }
void setDisplayModeratorRole(bool displayRole);
void setGroupBanVisible(bool visible) { mDisplayGroupBanOptions = visible; }
+// [RLVa:KB] - @shownames
+ void setRlvCheckShowNames(bool fRlvCheckShowNames) { mRlvCheckShowNames = fRlvCheckShowNames; }
+// [/RLVa:KB]
+
private:
void onAvatarNameCache(const LLAvatarName& av_name); // callback used by fetchAvatarName
@@ -222,6 +226,9 @@ class LLConversationItemParticipant : public LLConversationItem
bool mIsModeratorMuted; // default is false
bool mIsModerator; // default is false
bool mDisplayModeratorLabel; // default is false
+// [RLVa:KB] - @shownames
+ bool mRlvCheckShowNames;
+// [/RLVa:KB]
std::string mDisplayName;
F64 mDistToAgent; // Distance to the agent. A negative (meaningless) value means the distance has not been set.
boost::signals2::connection mAvatarNameCacheConnection;
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 4c833d92a1db38f582e2bf335c15ef060c5ad12f..1aa29cbb41620b26f0ab5f280fbc9726d06af79d 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1358,6 +1358,23 @@ void LLFloaterIMContainer::doToSelected(const LLSD& userdata)
const LLConversationItem * conversationItem = getCurSelectedViewModelItem();
uuid_vec_t selected_uuids;
+// [RLVa:KB] - @shownames
+ // Bulldozer block of all actions but both Catznip and Firestorm have no need for CHUI
+ if (!RlvActions::canShowName(RlvActions::SNC_DEFAULT))
+ {
+ if (LLConversationItemParticipant* pParticipantItem = dynamic_cast<LLConversationItemParticipant*>(const_cast<LLConversationItem*>(conversationItem)))
+ {
+ if (LLConversationItemSession* pParentSession = pParticipantItem->getParentSession())
+ {
+ if ( (pParentSession->getUUID().isNull()) && (selected_uuids.size() != 1 || !RlvActions::canShowName(RlvActions::SNC_DEFAULT, selected_uuids.front())) )
+ {
+ return;
+ }
+ }
+ }
+ }
+// [/RLVa:KB]
+
if(conversationItem != NULL)
{
getParticipantUUIDs(selected_uuids);
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 375461cfc173ce0190af1ef5a4844c59b997ab41..e954fa2e9cb013acdb1879a8798b2969d90f7638 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -37,6 +37,9 @@
#include "llconversationmodel.h"
#include "llconversationview.h"
#include "lltexteditor.h"
+// [RLVa:KB] - @shownames
+#include "rlvhelper.h"
+// [/RLVa:KB]
class LLPanelChatControlPanel;
class LLChatEntry;
@@ -45,6 +48,10 @@ class LLChatHistory;
class LLFloaterIMSessionTab
: public LLTransientDockableFloater
{
+// [RLVa:KB] - @shownames
+ friend struct RlvCommandHandler<RLV_TYPE_ADDREM, RLV_BHVR_SHOWNAMES>;
+ friend struct RlvCommandHandler<RLV_TYPE_ADDREM, RLV_BHVR_SHOWNEARBY>;
+// [/RLVa:KB]
public:
LOG_CLASS(LLFloaterIMSessionTab);
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 3cbdb2e9921872d4db21524e1db2529982624352..34eaafc0b8ae92fb85bc3d81136d7308d3286c0e 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1334,10 +1334,11 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
// [RLVa:KB] - Checked: RLVa-1.4.9
if (rlv_handler_t::isEnabled())
{
- if ( ((IM_LURE_USER == dialog) && (!RlvActions::canAcceptTpOffer(from_id))) ||
- ((IM_TELEPORT_REQUEST == dialog) && (!RlvActions::canAcceptTpRequest(from_id))) )
+ bool fBlockTpLure = (IM_LURE_USER == dialog) && (!RlvActions::canAcceptTpOffer(from_id));
+ bool fBlockTpRequest = (IM_TELEPORT_REQUEST == dialog) && (!RlvActions::canAcceptTpRequest(from_id));
+ if ( fBlockTpLure || fBlockTpRequest )
{
- RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RlvStringKeys::Blocked::TpLureRequestRemote));
+ RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(fBlockTpLure ? RlvStringKeys::Blocked::TpLureRemote : RlvStringKeys::Blocked::TpRequestRemote));
if (is_do_not_disturb)
send_do_not_disturb_message(gMessageSystem, from_id);
return;
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index 94d20828eccfc48143fc00ea85ddf2b46dda3e40..1f5ed9b1952ab63c37d3d4362d517595e12abc1c 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -276,6 +276,19 @@ void LLParticipantList::setValidateSpeakerCallback(validate_speaker_callback_t c
mValidateSpeakerCallback = cb;
}
+// [RLVa:KB] - @shownames
+void LLParticipantList::refreshNames()
+{
+ for (LLFolderViewModelItem* pChildItem : mChildren)
+ {
+ if (LLConversationItemParticipant* pConversationItem = dynamic_cast<LLConversationItemParticipant*>(pChildItem))
+ {
+ pConversationItem->updateName();
+ }
+ }
+}
+// [/RLVa:KB]
+
void LLParticipantList::update()
{
mSpeakerMgr->update(true);
@@ -388,6 +401,9 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id)
participant = new LLConversationItemParticipant(display_name.empty() ? LLTrans::getString("AvatarNameWaiting") : display_name, avatar_id, mRootViewModel);
mAvalineUpdater->watchAvalineCaller(avatar_id);
}
+// [RLVa:KB] - @shownames
+ participant->setRlvCheckShowNames(mSpeakerMgr->getSessionID().isNull());
+// [/RLVa:KB]
// *TODO : Need to update the online/offline status of the participant
// Hack for this: LLAvatarTracker::instance().isBuddyOnline(avatar_id))
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index 3a3ae76604a9c17bc8d0df5629b082bf66f686e9..8e89da37dd7247b5d549b6738393d05e39bb8878 100644
--- a/indra/newview/llparticipantlist.h
+++ b/indra/newview/llparticipantlist.h
@@ -51,6 +51,13 @@ class LLParticipantList : public LLConversationItemSession
*/
void addAvatarIDExceptAgent(const LLUUID& avatar_id);
+// [RLVa:KB] - @shownames
+ /**
+ * Refreshes the name of each (avatar) participant
+ */
+ void refreshNames();
+// [/RLVa:KB]
+
/**
* Refreshes the participant list.
*/
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 0c9304962391f641efb3132df72cf50ab9240ac3..581002e631e05267ffa7a87a8c7700d63e59721b 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -279,6 +279,23 @@ void RlvStrings::initClass()
}
}
+// Used to provide fallback behaviour whenever we rename/split/join customizable string values
+LLSD& RlvStrings::cleanStringValues(LLSD& sdStringValues)
+{
+ LLSD sdValues(sdStringValues);
+ for (LLSD::map_const_iterator itString = sdValues.beginMap(); itString != sdValues.endMap(); ++itString)
+ {
+ if (itString->first == "blocked_tplurerequest_remote")
+ {
+ sdStringValues.erase("blocked_tplurerequest_remote");
+ sdStringValues[RlvStringKeys::Blocked::TpLureRemote] = itString->second;
+ sdStringValues[RlvStringKeys::Blocked::TpRequestRemote] = itString->second;
+ }
+ }
+
+ return sdStringValues;
+}
+
// Checked: 2011-11-08 (RLVa-1.5.0)
void RlvStrings::loadFromFile(const std::string& strFilePath, bool fUserOverride)
{
@@ -289,7 +306,7 @@ void RlvStrings::loadFromFile(const std::string& strFilePath, bool fUserOverride
if (sdFileData.has("strings"))
{
- const LLSD& sdStrings = sdFileData["strings"];
+ const LLSD sdStrings = (!fUserOverride) ? sdFileData["strings"] : cleanStringValues(sdFileData["strings"]);
for (LLSD::map_const_iterator itString = sdStrings.beginMap(); itString != sdStrings.endMap(); ++itString)
{
if ( (!itString->second.has("value")) || ((fUserOverride) && (!hasString(itString->first))) )
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index 008e4d6fa4553076f3383a914c13b07a8b5db450..666d036e4de96fd82e7acce9539a58ae3a74e2eb 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -148,6 +148,7 @@ class RlvStrings
{
public:
static void initClass();
+ static LLSD& cleanStringValues(LLSD& sdValues);
static void loadFromFile(const std::string& strFilePath, bool fDefault);
static void saveToFile(const std::string& strFilePath);
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index d5ac8a6fceb381d8b50f7dab0678515a3f63e4d7..549a442bd8d6967f6c922814c80423ed4456c5e3 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -469,28 +469,30 @@ namespace RlvStringKeys
/*inline*/ constexpr boost::string_view StartIm = make_string_view("blocked_startim");
/*inline*/ constexpr boost::string_view Teleport = make_string_view("blocked_teleport");
/*inline*/ constexpr boost::string_view TeleportOffer = make_string_view("blocked_teleport_offer");
- /*inline*/ constexpr boost::string_view TpLureRequestRemote = make_string_view("blocked_tplurerequest_remote");
+ /*inline*/ constexpr boost::string_view TpLureRemote = make_string_view("blocked_tplure_remote");
+ /*inline*/ constexpr boost::string_view TpRequestRemote = make_string_view("blocked_tprequest_remote");
/*inline*/ constexpr boost::string_view ViewXxx = make_string_view("blocked_viewxxx");
/*inline*/ constexpr boost::string_view Wireframe = make_string_view("blocked_wireframe");
#else
- constexpr const char AutoPilot[] = "blocked_autopilot";
- constexpr const char Generic[] = "blocked_generic";
- constexpr const char GroupChange[] = "blocked_groupchange";
- constexpr const char InvFolder[] = "blocked_invfolder";
- constexpr const char PermissionAttach[] = "blocked_permattach";
- constexpr const char PermissionTeleport[] = "blocked_permteleport";
- constexpr const char RecvIm[] = "blocked_recvim";
- constexpr const char RecvImRemote[] = "blocked_recvim_remote";
- constexpr const char SendIm[] = "blocked_sendim";
- constexpr const char Share[] = "blocked_share";
- constexpr const char ShareGeneric[] = "blocked_share_generic";
- constexpr const char StartConference[] = "blocked_startconf";
- constexpr const char StartIm[] = "blocked_startim";
- constexpr const char Teleport[] = "blocked_teleport";
- constexpr const char TeleportOffer[] = "blocked_teleport_offer";
- constexpr const char TpLureRequestRemote[] = "blocked_tplurerequest_remote";
- constexpr const char ViewXxx[] = "blocked_viewxxx";
- constexpr const char Wireframe[] = "blocked_wireframe";
+ static constexpr const char AutoPilot[] = "blocked_autopilot";
+ static constexpr const char Generic[] = "blocked_generic";
+ static constexpr const char GroupChange[] = "blocked_groupchange";
+ static constexpr const char InvFolder[] = "blocked_invfolder";
+ static constexpr const char PermissionAttach[] = "blocked_permattach";
+ static constexpr const char PermissionTeleport[] = "blocked_permteleport";
+ static constexpr const char RecvIm[] = "blocked_recvim";
+ static constexpr const char RecvImRemote[] = "blocked_recvim_remote";
+ static constexpr const char SendIm[] = "blocked_sendim";
+ static constexpr const char Share[] = "blocked_share";
+ static constexpr const char ShareGeneric[] = "blocked_share_generic";
+ static constexpr const char StartConference[] = "blocked_startconf";
+ static constexpr const char StartIm[] = "blocked_startim";
+ static constexpr const char Teleport[] = "blocked_teleport";
+ static constexpr const char TeleportOffer[] = "blocked_teleport_offer";
+ static constexpr const char TpLureRemote[] = "blocked_tplure_remote";
+ static constexpr const char TpRequestRemote[] = "blocked_tprequest_remote";
+ static constexpr const char ViewXxx[] = "blocked_viewxxx";
+ static constexpr const char Wireframe[] = "blocked_wireframe";
#endif // CATZNIP_STRINGVIEW
}
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index e8d87fb503ff20679ba694e30c2b7018c9e49885..3a7662c0cf67ec2e7ce1dfd5010f40b4f36744b4 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -38,6 +38,7 @@
#include "llavatarnamecache.h" // @shownames
#include "llavatarlist.h" // @shownames
#include "llfloatercamera.h" // @setcam family
+#include "llfloaterimnearbychat.h" // @shownames
#include "llfloatersidepanelcontainer.h"// @shownames
#include "llnotifications.h" // @list IM query
#include "llnotificationsutil.h"
@@ -45,6 +46,7 @@
#include "llpaneloutfitsinventory.h" // @showinv - "Appearance" floater
#include "llpanelpeople.h" // @shownames
#include "llpanelwearing.h" // @showinv - "Appearance / Current Outfit" panel
+#include "llparticipantlist.h" // @shownames
#include "llregionhandle.h" // @tpto
#include "llsidepanelappearance.h" // @showinv - "Appearance / Edit appearance" panel
#include "lltabcontainer.h" // @showinv - Tab container control for inventory tabs
@@ -2603,6 +2605,15 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNAMES>::onCommandToggle(ERlvBehaviou
pPeoplePanel->getNearbyList()->updateAvatarNames();
}
+ // Refresh the nearby participant list
+ if (LLFloaterIMNearbyChat* pNearbyChatFloater = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))
+ {
+ if (LLParticipantList* pParticipantList = pNearbyChatFloater->getParticipantList())
+ {
+ pParticipantList->refreshNames();
+ }
+ }
+
// Force the use of the "display name" cache so we can filter both display and legacy names (or return back to the user's preference)
if (fHasBhvr)
{
@@ -2695,6 +2706,17 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNEARBY>::onCommandToggle(ERlvBehavio
pPeoplePanel->updateNearbyList();
}
+ // Refresh the nearby participant list
+ if (LLFloaterIMNearbyChat* pNearbyChatFloater = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))
+ {
+#ifdef CATZNIP
+ pNearbyChatFloater->updateShowParticipantList();
+ pNearbyChatFloater->updateExpandCollapseBtn();
+#else
+ // *TODO - Solution for CHUI
+#endif // CATZNIP
+ }
+
// Refresh that avatar's name tag and all HUD text
LLHUDText::refreshAllObjectText();
}
diff --git a/indra/newview/skins/default/xui/en/rlva_strings.xml b/indra/newview/skins/default/xui/en/rlva_strings.xml
index 3ffb3d90094faa6b79b16e959a6ecb84b45d39a9..95321f7ac68ba2b992279cda923d5bc8cbf01052 100644
--- a/indra/newview/skins/default/xui/en/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/en/rlva_strings.xml
@@ -194,14 +194,25 @@
<key>customizable</key>
<boolean>1</boolean>
</map>
- <key>blocked_tplurerequest_remote</key>
+ <key>blocked_tplure_remote</key>
<map>
<key>value</key>
<string>The Resident is currently prevented from accepting. Please try again later.</string>
<key>description</key>
- <string>Sent to the remote party when their teleport offer or request was blocked</string>
+ <string>Sent to the remote party when their teleport offer was blocked</string>
<key>label</key>
- <string>Blocked teleport offer/request (remote)</string>
+ <string>Blocked teleport offer (remote)</string>
+ <key>customizable</key>
+ <boolean>1</boolean>
+ </map>
+ <key>blocked_tprequest_remote</key>
+ <map>
+ <key>value</key>
+ <string>The Resident is currently prevented from accepting. Please try again later.</string>
+ <key>description</key>
+ <string>Sent to the remote party when their teleport request was blocked</string>
+ <key>label</key>
+ <string>Blocked teleport request (remote)</string>
<key>customizable</key>
<boolean>1</boolean>
</map>