diff options
| author | Joshua Bell <josh@lindenlab.com> | 2011-05-11 17:37:32 -0700 |
|---|---|---|
| committer | Joshua Bell <josh@lindenlab.com> | 2011-05-11 17:37:32 -0700 |
| commit | 48a5f6a9f225e3d75eb4f64da654e91b117b32ba (patch) | |
| tree | 3e15558ef81aac1cd191760d595b767e51fa5ddc /indra/newview/llviewerparcelmgr.cpp | |
| parent | e54e9b4eed615f98f1e1fd167178b6d75c3fda43 (diff) | |
| parent | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (diff) | |
Merge
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; } |