diff options
| author | Richard Linden <none@none> | 2011-05-12 11:38:32 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-12 11:38:32 -0700 |
| commit | e18f200243b5d9e5adba244634ecdaa4ac7da8dc (patch) | |
| tree | e39dbd23c35f1c43f48f17aa02c162ae2e58c789 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 524345ab0e87953abcea023ebc274f0440ef2e85 (diff) | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index e84e4a859a..c84a14f62c 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -2200,7 +2200,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; } |