fix for task EXT-4750 Disable "Join" dialog for free groups

also add group name to notification - more informative...

--HG--
branch : product-engine
meow-7.2.2
Ychebotarev ProductEngine 2010-02-04 12:39:13 +02:00
parent e5bd3b8a48
commit 482eefcba9
2 changed files with 19 additions and 1 deletions

View File

@ -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
{

View File

@ -411,6 +411,19 @@ Do you wish to proceed?
yestext="Join"/>
</notification>
<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"