diff options
| author | prep <prep@lindenlab.com> | 2011-05-25 12:42:06 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-05-25 12:42:06 -0400 |
| commit | 7392cf49bae155e7d53413e9f73143906ae8e310 (patch) | |
| tree | cbc53ba683744a0f50536998263f71327dc86a35 /indra/newview/llviewerparcelmgr.cpp | |
| parent | b76d15ed14abfe3b4c422ba9ff3d4151de8a31ea (diff) | |
| parent | 594f1da03b02d09c57699b543692ebd85cdcff17 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 5ae4e872f3..8db72da1ee 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -2202,9 +2202,9 @@ bool LLViewerParcelMgr::canAgentBuyParcel(LLParcel* parcel, bool forGroup) const = parcelOwner == (forGroup ? gAgent.getGroupID() : gAgent.getID()); bool isAuthorized - = (authorizeBuyer.isNull()
- || (gAgent.getID() == authorizeBuyer)
- || (gAgent.hasPowerInGroup(authorizeBuyer,GP_LAND_DEED)
+ = (authorizeBuyer.isNull() + || (gAgent.getID() == authorizeBuyer) + || (gAgent.hasPowerInGroup(authorizeBuyer,GP_LAND_DEED) && gAgent.hasPowerInGroup(authorizeBuyer,GP_LAND_SET_SALE_INFO))); return isForSale && !isOwner && isAuthorized && isEmpowered; |