Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use friendlier names in friendly situations~

Browse Source
This commit is contained in:
Inusaito Sayori
2015-02-12 23:46:22 -05:00
parent d1e5d67336
commit de96b8e43e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llcallingcard.cpp
View File

@@ -65,6 +65,7 @@
///---------------------------------------------------------------------------- ///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs /// Local function declarations, constants, enums, and typedefs
///---------------------------------------------------------------------------- ///----------------------------------------------------------------------------
const S32& friend_name_system();
class LLTrackingData class LLTrackingData
{ {
@@ -635,7 +636,7 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
{ {
std::string fullname; std::string fullname;
LLSD args; LLSD args;
if (LLAvatarNameCache::getNSName(agent_id, fullname)) if (LLAvatarNameCache::getNSName(agent_id, fullname, friend_name_system()))
args["NAME"] = fullname; args["NAME"] = fullname;
LLSD payload; LLSD payload;
@@ -654,7 +655,7 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
{ {
std::string fullname; std::string fullname;
LLSD args; LLSD args;
if (LLAvatarNameCache::getNSName(agent_id, fullname)) if (LLAvatarNameCache::getNSName(agent_id, fullname, friend_name_system()))
args["NAME"] = fullname; args["NAME"] = fullname;
LLSD payload; LLSD payload;
@@ -743,7 +744,7 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
// Popup a notify box with online status of this agent // Popup a notify box with online status of this agent
// Use display name only because this user is your friend // Use display name only because this user is your friend
LLSD args; LLSD args;
args["NAME"] = av_name.getNSName(); args["NAME"] = av_name.getNSName(friend_name_system());
args["STATUS"] = online ? LLTrans::getString("OnlineStatus") : LLTrans::getString("OfflineStatus"); args["STATUS"] = online ? LLTrans::getString("OnlineStatus") : LLTrans::getString("OfflineStatus");
// Popup a notify box with online status of this agent // Popup a notify box with online status of this agent
@@ -900,7 +901,7 @@ bool LLCollectMappableBuddies::operator()(const LLUUID& buddy_id, LLRelationship
{ {
LLAvatarName av_name; LLAvatarName av_name;
LLAvatarNameCache::get( buddy_id, &av_name); LLAvatarNameCache::get( buddy_id, &av_name);
buddy_map_t::value_type value(av_name.getDisplayName(), buddy_id); buddy_map_t::value_type value(av_name.getNSName(friend_name_system()), buddy_id);
if(buddy->isOnline() && buddy->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)) if(buddy->isOnline() && buddy->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION))
{ {
mMappable.insert(value); mMappable.insert(value);
@@ -919,7 +920,6 @@ bool LLCollectOnlineBuddies::operator()(const LLUUID& buddy_id, LLRelationship*
return true; return true;
} }
const S32& friend_name_system();
bool LLCollectAllBuddies::operator()(const LLUUID& buddy_id, LLRelationship* buddy) bool LLCollectAllBuddies::operator()(const LLUUID& buddy_id, LLRelationship* buddy)
{ {
LLAvatarName av_name; LLAvatarName av_name;