diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
| commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
| tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/llviewermessage.cpp | |
| parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
| parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index fdb6729b45..7c0fc681a4 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2509,15 +2509,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) invite_bucket = (struct invite_bucket_t*) &binary_bucket[0]; S32 membership_fee = ntohl(invite_bucket->membership_fee); - // IDEVO Clean up legacy name "Resident" in message constructed in - // lldatagroups.cpp - U32 pos = message.find(" has invited you to join a group.\n"); - if (pos != std::string::npos) - { - // use cleaned-up name from above - message = name + message.substr(pos); - } - LLSD payload; payload["transaction_id"] = session_id; payload["group_id"] = from_id; |