diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:28:31 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:28:31 +0000 |
| commit | 23877285636610ecf426dc4d40f358a6f2eb4c92 (patch) | |
| tree | 6cfcd893db43a26355f2cb3c1ffc75f431a55530 /indra/newview/llgroupactions.cpp | |
| parent | 2c30ccf34d518ccedd0b3ffdeb2ba1da8d140a1d (diff) | |
| parent | 879675d986e8167db880586598358e6a80147108 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
| -rw-r--r-- | indra/newview/llgroupactions.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 3653371d76..00e2365ffd 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -161,12 +161,17 @@ void LLGroupActions::join(const LLUUID& group_id) S32 cost = gdatap->mMembershipFee; LLSD args; args["COST"] = llformat("%d", cost); + args["NAME"] = gdatap->mName; LLSD payload; payload["group_id"] = group_id; if (can_afford_transaction(cost)) { - LLNotificationsUtil::add("JoinGroupCanAfford", args, payload, onJoinGroup); + if(cost > 0) + LLNotificationsUtil::add("JoinGroupCanAfford", args, payload, onJoinGroup); + else + LLNotificationsUtil::add("JoinGroupNoCost", args, payload, onJoinGroup); + } else { |