livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ER-480 Viewer work for abandoned land. 

* Support group members with the right powers buying land set for sale to a group
* Add dialogs for abandoned land related notifications.
meow-7.2.2
Kelly Washington 2011-05-10 08:40:00 -07:00
parent 27fa37d778
commit f34bca0a0c
3 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterbuyland.cpp
View File

@ -459,10 +459,18 @@ void LLFloaterBuyLandUI::updateParcelInfo()
return;
}
if (!authorizedBuyer.isNull() && buyer != authorizedBuyer)
if (!authorizedBuyer.isNull() && buyer != authorizedBuyer)
{
mCannotBuyReason = getString("set_to_sell_to_other");
return;
// Maybe the parcel is set for sale to a group we are in.
bool authorized_group =
gAgent.hasPowerInGroup(authorizedBuyer,GP_LAND_DEED)
&& gAgent.hasPowerInGroup(authorizedBuyer,GP_LAND_SET_SALE_INFO);
if (!authorized_group)
{
mCannotBuyReason = getString("set_to_sell_to_other");
return;
}
}
}
else

5
indra/newview/llviewerparcelmgr.cpp
View File

@ -2216,7 +2216,10 @@ bool LLViewerParcelMgr::canAgentBuyParcel(LLParcel* parcel, bool forGroup) const
= parcelOwner == (forGroup ? gAgent.getGroupID() : gAgent.getID());
bool isAuthorized
= (authorizeBuyer.isNull() || (gAgent.getID() == authorizeBuyer));
= (authorizeBuyer.isNull()
|| (gAgent.getID() == authorizeBuyer)
|| (gAgent.hasPowerInGroup(authorizeBuyer,GP_LAND_DEED)
&& gAgent.hasPowerInGroup(authorizeBuyer,GP_LAND_SET_SALE_INFO)));
return isForSale && !isOwner && isAuthorized && isEmpowered;
}

28
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -6633,6 +6633,34 @@ Items successfully shared.
Deed to group failed.
</notification>
<notification
icon="notifytip.tga"
name="ReleaseLandThrottled"
type="notifytip">
The parcel [PARCEL_NAME] can not be abandoned at this time.
tag>fail</tag>
</notification>
<notification
icon="notifytip.tga"
name="ReleasedLandWithReclaim"
type="notifytip">
The [AREA] m² parcel &apos;[PARCEL_NAME]&apos; has been released.
You will have [RECLAIM_PERIOD] hours to reclaim for L$0 before it is set for sale to anyone.
<tag>fail</tag>
</notification>
<notification
icon="notifytip.tga"
name="ReleasedLandNoReclaim"
type="notifytip">
The [AREA] m² parcel &apos;[PARCEL_NAME]&apos; has been released.
It is now available for purchase by anyone.
<tag>fail</tag>
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezNotification"