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

Actually use the namecache callback results when displaying currency transaction notifications.

Browse Source
This commit is contained in:
Shyotl
2013-02-12 14:47:59 -06:00
parent c799f9f7eb
commit 0759f2dae8
1 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
indra/newview/llviewermessage.cpp
View File

@@ -5799,6 +5799,18 @@ static std::string reason_from_transaction_type(S32 transaction_type,
} }
} }
static void process_money_group_name_reply(const std::string& name, const std::string notification, LLSD args, LLSD payload)
{
args["NAME"] = name;
LLNotificationsUtil::add(notification,args,payload);
}
static void process_money_avatar_name_reply(const LLAvatarName& name, const std::string notification, LLSD args, LLSD payload)
{
std::string av_name;
LLAvatarNameCache::getPNSName(name,av_name);
args["NAME"] = av_name;
LLNotificationsUtil::add(notification,args,payload);
}
static void process_money_balance_reply_extended(LLMessageSystem* msg) static void process_money_balance_reply_extended(LLMessageSystem* msg)
{ {
// Added in server 1.40 and viewer 2.1, support for localization // Added in server 1.40 and viewer 2.1, support for localization
@@ -5831,26 +5843,6 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
return; return;
} }
std::string source_slurl;
if (is_source_group)
{
gCacheName->getGroupName(source_id, source_slurl);
}
else
{
LLAvatarNameCache::getPNSName(source_id, source_slurl);
}
std::string dest_slurl;
if (is_dest_group)
{
gCacheName->getGroupName(dest_id, dest_slurl);
}
else
{
LLAvatarNameCache::getPNSName(dest_id, dest_slurl);
}
std::string reason = std::string reason =
reason_from_transaction_type(transaction_type, item_description); reason_from_transaction_type(transaction_type, item_description);
@@ -5871,7 +5863,6 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
bool you_paid_someone = (source_id == gAgentID); bool you_paid_someone = (source_id == gAgentID);
if (you_paid_someone) if (you_paid_someone)
{ {
args["NAME"] = dest_slurl;
is_name_group = is_dest_group; is_name_group = is_dest_group;
name_id = dest_id; name_id = dest_id;
if (!reason.empty()) if (!reason.empty())
@@ -5907,7 +5898,6 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
else else
{ {
// ...someone paid you // ...someone paid you
args["NAME"] = source_slurl;
is_name_group = is_source_group; is_name_group = is_source_group;
name_id = source_id; name_id = source_id;
if (!reason.empty()) if (!reason.empty())
@@ -5930,14 +5920,14 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
if (is_name_group) if (is_name_group)
{ {
gCacheName->getGroup(name_id, gCacheName->getGroup(name_id,
boost::bind(&LLNotificationsUtil::add, boost::bind(&process_money_group_name_reply,
notification, final_args, payload)); _2, notification, final_args, payload));
} }
else else
{ {
LLAvatarNameCache::get(name_id, LLAvatarNameCache::get(name_id,
boost::bind(&LLNotificationsUtil::add, boost::bind(&process_money_avatar_name_reply,
notification, final_args, payload)); _2, notification, final_args, payload));
} }
} }