summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-26 12:02:29 -0700
committerJames Cook <james@lindenlab.com>2010-05-26 12:02:29 -0700
commitb921d251b8708be7922456e69120559e0f4c69fa (patch)
tree9f221f772607de91d8c33e8dd2e4efa83050bc81 /indra
parentb6a0211a7ef5da8abdc939e5335ba096831f5032 (diff)
DEV-50466 Fix spurious warnings when someone pays you
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewermessage.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 21ba38ecfc..ccd2f6ea0e 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4948,6 +4948,13 @@ static std::string reason_from_transaction_type(S32 transaction_type,
case TRANS_UPLOAD_CHARGE:
return LLTrans::getString("to upload");
+ // These have no reason to display, but are expected and should not
+ // generate warnings
+ case TRANS_GIFT:
+ case TRANS_PAY_OBJECT:
+ case TRANS_OBJECT_PAYS:
+ return std::string();
+
default:
llwarns << "Unknown transaction type "
<< transaction_type << llendl;