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

Once more, with feeling. (currency transaction messages)

Browse Source
This commit is contained in:
Shyotl
2013-02-13 16:31:16 -06:00
parent 8ec5915b7c
commit 2f5ab6f8e8
2 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
indra/newview/llviewermessage.cpp
View File

@@ -5799,17 +5799,34 @@ 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) static void money_balance_group_notify(const LLUUID& group_id,
const std::string& name,
bool is_group,
std::string message,
std::string notification,
LLStringUtil::format_map_t args,
LLSD payload)
{ {
args["NAME"] = name; args["NAME"] = name;
LLNotificationsUtil::add(notification,args,payload); LLSD msg_args;
msg_args["MESSAGE"] = LLTrans::getString(message,args);
LLNotificationsUtil::add(notification,msg_args,payload);
} }
static void process_money_avatar_name_reply(const LLAvatarName& name, const std::string notification, LLSD args, LLSD payload)
static void money_balance_avatar_notify(const LLUUID& agent_id,
const LLAvatarName& av_name,
std::string message,
std::string notification,
LLStringUtil::format_map_t args,
LLSD payload)
{ {
std::string av_name;
LLAvatarNameCache::getPNSName(name,av_name); std::string name;
args["NAME"] = av_name; LLAvatarNameCache::getPNSName(av_name,name);
LLNotificationsUtil::add(notification,args,payload); args["NAME"] = name;
LLSD msg_args;
msg_args["MESSAGE"] = LLTrans::getString(message,args);
LLNotificationsUtil::add(notification,msg_args,payload);
} }
static void process_money_balance_reply_extended(LLMessageSystem* msg) static void process_money_balance_reply_extended(LLMessageSystem* msg)
{ {
@@ -5857,7 +5874,6 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
std::string message; std::string message;
static LLCachedControl<bool> no_transaction_clutter("LiruNoTransactionClutter", false); static LLCachedControl<bool> no_transaction_clutter("LiruNoTransactionClutter", false);
std::string notification = no_transaction_clutter ? "Payment" : "SystemMessage"; std::string notification = no_transaction_clutter ? "Payment" : "SystemMessage";
LLSD final_args;
LLSD payload; LLSD payload;
bool you_paid_someone = (source_id == gAgentID); bool you_paid_someone = (source_id == gAgentID);
@@ -5869,31 +5885,30 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
{ {
if (dest_id.notNull()) if (dest_id.notNull())
{ {
message = success ? LLTrans::getString("you_paid_ldollars", args) : message = success ? "you_paid_ldollars" :
LLTrans::getString("you_paid_failure_ldollars", args); "you_paid_failure_ldollars";
} }
else else
{ {
// transaction fee to the system, eg, to create a group // transaction fee to the system, eg, to create a group
message = success ? LLTrans::getString("you_paid_ldollars_no_name", args) : message = success ? "you_paid_ldollars_no_name" :
LLTrans::getString("you_paid_failure_ldollars_no_name", args); "you_paid_failure_ldollars_no_name";
} }
} }
else else
{ {
if (dest_id.notNull()) if (dest_id.notNull())
{ {
message = success ? LLTrans::getString("you_paid_ldollars_no_reason", args) : message = success ? "you_paid_ldollars_no_reason" :
LLTrans::getString("you_paid_failure_ldollars_no_reason", args); "you_paid_failure_ldollars_no_reason";
} }
else else
{ {
// no target, no reason, you just paid money // no target, no reason, you just paid money
message = success ? LLTrans::getString("you_paid_ldollars_no_info", args) : message = success ? "you_paid_ldollars_no_info" :
LLTrans::getString("you_paid_failure_ldollars_no_info", args); "you_paid_failure_ldollars_no_info";
} }
} }
final_args["MESSAGE"] = message;
} }
else else
{ {
@@ -5902,13 +5917,12 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
name_id = source_id; name_id = source_id;
if (!reason.empty()) if (!reason.empty())
{ {
message = LLTrans::getString("paid_you_ldollars", args); message = "paid_you_ldollars";
} }
else else
{ {
message = LLTrans::getString("paid_you_ldollars_no_reason", args); message = "paid_you_ldollars_no_reason";
} }
final_args["MESSAGE"] = message;
// make notification loggable // make notification loggable
payload["from_id"] = source_id; payload["from_id"] = source_id;
@@ -5920,14 +5934,15 @@ 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(&process_money_group_name_reply, boost::bind(&money_balance_group_notify,
_2, notification, final_args, payload)); _1, _2, _3, message,
notification, args, payload));
} }
else else {
{
LLAvatarNameCache::get(name_id, LLAvatarNameCache::get(name_id,
boost::bind(&process_money_avatar_name_reply, boost::bind(&money_balance_avatar_notify,
_2, notification, final_args, payload)); _1, _2, message,
notification, args, payload));
} }
} }

22
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -1908,7 +1908,7 @@ Requests that a nonphysical object be keyframed according to keyframe list.
</string> </string>
<string name="LSLTipText_llTransferLindenDollars"> <string name="LSLTipText_llTransferLindenDollars">
key llTransferLindenDollars(key destination, integer amount) key llTransferLindenDollars(key destination, integer amount)
Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer. Transfer amount of linden dollars ([CURRENCY]) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
</string> </string>
<string name="LSLTipText_llGetParcelMusicURL"> <string name="LSLTipText_llGetParcelMusicURL">
string llGetParcelMusicURL() string llGetParcelMusicURL()
@@ -4005,16 +4005,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Home position set.">Home position set.</string> <string name="Home position set.">Home position set.</string>
<!-- Financial operations strings --> <!-- Financial operations strings -->
<string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT] [REASON].</string> <string name="paid_you_ldollars">[NAME] paid you [CURRENCY][AMOUNT] [REASON].</string>
<string name="paid_you_ldollars_no_reason">[NAME] paid you L$[AMOUNT].</string> <string name="paid_you_ldollars_no_reason">[NAME] paid you [CURRENCY][AMOUNT].</string>
<string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string> <string name="you_paid_ldollars">You paid [NAME] [CURRENCY][AMOUNT] [REASON].</string>
<string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string> <string name="you_paid_ldollars_no_info">You paid [CURRENCY][AMOUNT].</string>
<string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string> <string name="you_paid_ldollars_no_reason">You paid [NAME] [CURRENCY][AMOUNT].</string>
<string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string> <string name="you_paid_ldollars_no_name">You paid [CURRENCY][AMOUNT] [REASON].</string>
<string name="you_paid_failure_ldollars">You failed to pay [NAME] L$[AMOUNT] [REASON].</string> <string name="you_paid_failure_ldollars">You failed to pay [NAME] [CURRENCY][AMOUNT] [REASON].</string>
<string name="you_paid_failure_ldollars_no_info">You failed to pay L$[AMOUNT].</string> <string name="you_paid_failure_ldollars_no_info">You failed to pay [CURRENCY][AMOUNT].</string>
<string name="you_paid_failure_ldollars_no_reason">You failed to pay [NAME] L$[AMOUNT].</string> <string name="you_paid_failure_ldollars_no_reason">You failed to pay [NAME] [CURRENCY][AMOUNT].</string>
<string name="you_paid_failure_ldollars_no_name">You failed to pay L$[AMOUNT] [REASON].</string> <string name="you_paid_failure_ldollars_no_name">You failed to pay [CURRENCY][AMOUNT] [REASON].</string>
<string name="for item">for [ITEM]</string> <string name="for item">for [ITEM]</string>
<string name="for a parcel of land">for a parcel of land</string> <string name="for a parcel of land">for a parcel of land</string>
<string name="for a land access pass">for a land access pass</string> <string name="for a land access pass">for a land access pass</string>