diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplayname.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 11 |
3 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 8e8be842ef..8441796219 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -234,7 +234,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) LLStatusBar::sendMoneyBalanceRequest(); LLSD args; - args["AMOUNT"] = llformat("%d", expected_upload_cost) + std::string(" JAMESDEBUG 1101"); // JAMESDEBUG + args["AMOUNT"] = llformat("%d", expected_upload_cost); LLNotificationsUtil::add("UploadPayment", args); } diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp index 2c0219cfbc..9250117581 100644 --- a/indra/newview/llviewerdisplayname.cpp +++ b/indra/newview/llviewerdisplayname.cpp @@ -90,6 +90,8 @@ void LLViewerDisplayName::set(const std::string& display_name, const set_name_sl class LLSetDisplayNameReply : public LLHTTPNode { + LOG_CLASS(LLSetDisplayNameReply); +public: /*virtual*/ void post( LLHTTPNode::ResponsePtr response, const LLSD& context, @@ -102,8 +104,7 @@ class LLSetDisplayNameReply : public LLHTTPNode std::string reason = body["reason"].asString(); LLSD content = body["content"]; - llinfos << "JAMESDEBUG LLSetDisplayNameReply status " << status - << " reason " << reason << llendl; + llinfos << "status " << status << " reason " << reason << llendl; // inform caller of result LLViewerDisplayName::sSetDisplayNameSignal(success, reason, content); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 000eb45121..0d4bf6e40f 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4614,9 +4614,9 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) msg->getBOOL("TransactionInfo", "IsDestGroup", is_dest_group); msg->getS32("TransactionInfo", "Amount", amount); msg->getString("TransactionInfo", "ItemDescription", item_description); - llinfos << "JAMESDEBUG money_balance_reply source " << source_id + LL_DEBUGS("Money") << "MoneyBalanceReply source " << source_id << " dest " << dest_id - << " item " << item_description << llendl; + << " item " << item_description << LL_ENDL; } if (gStatusBar) @@ -4658,7 +4658,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) // "<avatar name> paid you L$" const std::string marker = "paid you L$"; - args["MESSAGE"] = desc + llformat(" JAMESDEBUG %d", transaction_type); // JAMESDEBUG; + args["MESSAGE"] = desc; // extract avatar name from system message S32 marker_pos = desc.find(marker, 0); @@ -4683,8 +4683,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) str_args["AMOUNT"] = ammount; std::string new_description = LLTrans::getString("paid_you_ldollars", str_args); - - args["MESSAGE"] = new_description + llformat(" JAMESDEBUG %d", transaction_type); // JAMESDEBUG + args["MESSAGE"] = new_description; args["NAME"] = LLCacheName::cleanFullName(name); LLSD payload; payload["from_id"] = from_id; @@ -4744,7 +4743,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) // forming final message string by retrieving localized version from xml // and applying previously found arguments line = LLTrans::getString(line, str_args); - args["MESSAGE"] = line + llformat(" JAMESDEBUG %d", transaction_type); // JAMESDEBUG; + args["MESSAGE"] = line; } } |