diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
| commit | 76cf7ebf7037c2e579861c64c38fc24bde165669 (patch) | |
| tree | 72152ff4ae4cb5f6422cd8c4c9830b4f76c3aa21 /indra/newview/llgroupactions.cpp | |
| parent | d2d192060993d938a2fd131f8872a60b678e4a04 (diff) | |
| parent | 9a15ee8a91a12020b22625873c280837739f946c (diff) | |
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 { |