diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 12:39:13 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 12:39:13 +0200 |
| commit | 482eefcba94dac0e6a0e6f9985f582e724b02523 (patch) | |
| tree | e8ba3ba7f94e0a9f9581d1923c4bfe424953c2c8 /indra/newview | |
| parent | e5bd3b8a4846ee21cfaf726cfbf3e943b277e7c1 (diff) | |
fix for task EXT-4750 Disable "Join" dialog for free groups
also add group name to notification - more informative...
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llgroupactions.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 13 |
2 files changed, 19 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 { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 636db2b59b..7cc4af53f8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -413,6 +413,19 @@ Do you wish to proceed? <notification icon="alertmodal.tga" + name="JoinGroupNoCost" + type="alertmodal"> +You are Joining group [NAME]. +Do you wish to proceed? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Join"/> + </notification> + + + <notification + icon="alertmodal.tga" name="JoinGroupCannotAfford" type="alertmodal"> Joining this group costs L$[COST]. |