livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always show complete avatar name instead of displayname when changing avatar permissions etc. to avoid spoofing

Ansariel 2014-12-16 14:35:18 +01:00
parent 588943c719
commit c8c3809817
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/fsfloatercontacts.cpp
View File

@ -43,6 +43,7 @@
#include "llgrouplist.h"
#include "llnotificationsutil.h"
#include "llscrolllistctrl.h"
#include "llslurl.h"
#include "llstartup.h"
#include "lltabcontainer.h"
#include "llviewermenu.h"
@ -870,12 +871,7 @@ void FSFloaterContacts::confirmModifyRights(rights_map_t& ids, EGrantRevoke comm
// for single friend, show their name
if (ids.size() == 1)
{
LLUUID agent_id = ids.begin()->first;
std::string name;
if (gCacheName->getFullName(agent_id, name))
{
args["NAME"] = name;
}
args["NAME"] = LLSLURL("agent", ids.begin()->first, "completename").getSLURLString();
if (command == GRANT)
{
LLNotificationsUtil::add("GrantModifyRights",

3
indra/newview/fspanelprofile.cpp
View File

@ -1929,10 +1929,9 @@ void FSPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification,
}
void FSPanelAvatarNotes::confirmModifyRights(bool grant, S32 rights)
// AO: If this is modified, also modify LLPanelAvatar::ConfirmModifyRights
{
LLSD args;
args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
if (grant)
{

4
indra/newview/llavatarlistitem.cpp
View File

@ -1122,7 +1122,9 @@ void LLAvatarListItem::confirmModifyRights(bool grant, S32 rights)
// Same as llpanelavatar::confirmModifyRights
{
LLSD args;
args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
// <FS:Ansariel> Always show complete name in rights confirmation dialogs
//args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
if (grant)
{

4
indra/newview/llcallingcard.cpp
View File

@ -706,7 +706,9 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^ new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
{
LLSD args;
args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
// <FS:Ansariel> Always show complete name in rights dialogs
//args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
args["NAME"] = LLSLURL("agent", agent_id, "completename").getSLURLString();
LLSD payload;
payload["from_id"] = agent_id;

4
indra/newview/llpanelgrouproles.cpp
View File

@ -1227,7 +1227,9 @@ void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, c
for (uuid_vec_t::const_iterator i = selected_members.begin(); i != selected_members.end(); ++i)
{
LLSD args;
args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString();
// <FS:Ansariel> Always show complete name in rights confirmation dialogs
//args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString();
args["AVATAR_NAME"] = LLSLURL("agent", *i, "completename").getSLURLString();
args["GROUP_NAME"] = group_data->mName;
LLNotifications::instance().add(LLNotification::Params("EjectAvatarFromGroup").substitutions(args));

9
indra/newview/llviewermessage.cpp
View File

@ -8518,10 +8518,13 @@ void send_lures(const LLSD& notification, const LLSD& response)
// Record the offer.
{
std::string target_name;
gCacheName->getFullName(target_id, target_name); // for im log filenames
// <FS:Ansariel> Show complete name for TP lures
//std::string target_name;
//gCacheName->getFullName(target_id, target_name); // for im log filenames
LLSD args;
args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();;
//args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();;
args["TO_NAME"] = LLSLURL("agent", target_id, "completename").getSLURLString();
// </FS:Ansariel>
LLSD payload;